Commit ea09b8d5 authored by Glenn Morris's avatar Glenn Morris
Browse files

(--without-sync-input, --with-pkg-config-prog): Help strings start

with lower case.
(--with-gnustep-conf): New option.
(GNUSTEP_CONFIG_FILE): Use, instead of fixed /etc/GNUstep/GNUstep.conf.
parent ef913c89
2008-10-24 Glenn Morris <rgm@gnu.org>
* configure.in (--without-sync-input, --with-pkg-config-prog):
Help strings start with lower case.
(--with-gnustep-conf): New option.
(GNUSTEP_CONFIG_FILE): Use, instead of fixed /etc/GNUstep/GNUstep.conf.
2008-10-24 Yavor Doganov <yavor@gnu.org> (tiny change) 2008-10-24 Yavor Doganov <yavor@gnu.org> (tiny change)
* configure.in: Use `.' instead of `source' to source GNUstep.conf. * configure.in: Use `.' instead of `source' to source GNUstep.conf.
......
...@@ -97,7 +97,7 @@ fi ...@@ -97,7 +97,7 @@ fi
OPTION_DEFAULT_ON([sound],[don't compile with sound support]) OPTION_DEFAULT_ON([sound],[don't compile with sound support])
OPTION_DEFAULT_ON([sync-input],[Process async input synchronously]) OPTION_DEFAULT_ON([sync-input],[process async input synchronously])
if test "$with_sync_input" = yes; then if test "$with_sync_input" = yes; then
AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.]) AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.])
fi fi
...@@ -162,13 +162,20 @@ variable to specify a compiler.])],,) ...@@ -162,13 +162,20 @@ variable to specify a compiler.])],,)
AC_ARG_WITH([pkg-config-prog],dnl AC_ARG_WITH([pkg-config-prog],dnl
[AS_HELP_STRING([--with-pkg-config-prog=PATH], [AS_HELP_STRING([--with-pkg-config-prog=PATH],
[Path to pkg-config for finding GTK and librsvg])]) [path to pkg-config for finding GTK and librsvg])])
if test "X${with_pkg_config_prog}" != X; then if test "X${with_pkg_config_prog}" != X; then
if test "${with_pkg_config_prog}" != yes; then if test "${with_pkg_config_prog}" != yes; then
PKG_CONFIG="${with_pkg_config_prog}" PKG_CONFIG="${with_pkg_config_prog}"
fi fi
fi fi
AC_ARG_WITH([gnustep-conf],dnl
[AS_HELP_STRING([--with-gnustep-conf=PATH],[path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE, or /etc/GNUstep/GNUstep.conf])])
test "X${with_gnustep_conf}" != X && test "${with_gnustep_conf}" != yes && \
GNUSTEP_CONFIG_FILE="${with_gnustep_conf}"
test "X$GNUSTEP_CONFIG_FILE" = "X" && \
GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf
AC_ARG_ENABLE(cocoa-experimental-ctrl-g, AC_ARG_ENABLE(cocoa-experimental-ctrl-g,
[AS_HELP_STRING([--enable-cocoa-experimental-ctrl-g], [AS_HELP_STRING([--enable-cocoa-experimental-ctrl-g],
[enable experimental improved ctrl-g recognition])], [enable experimental improved ctrl-g recognition])],
...@@ -1233,15 +1240,16 @@ if test "${with_ns}" != no; then ...@@ -1233,15 +1240,16 @@ if test "${with_ns}" != no; then
ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS ns_appbindir=`pwd`/nextstep/Emacs.app/Contents/MacOS
ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources ns_appresdir=`pwd`/nextstep/Emacs.app/Contents/Resources
ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base
elif test -f /etc/GNUstep/GNUstep.conf; then elif test -f $GNUSTEP_CONFIG_FILE; then
NS_IMPL_GNUSTEP=yes NS_IMPL_GNUSTEP=yes
ns_appdir=`pwd`/nextstep/Emacs.app ns_appdir=`pwd`/nextstep/Emacs.app
ns_appbindir=`pwd`/nextstep/Emacs.app ns_appbindir=`pwd`/nextstep/Emacs.app
ns_appresdir=`pwd`/nextstep/Emacs.app/Resources ns_appresdir=`pwd`/nextstep/Emacs.app/Resources
ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base
GNUSTEP_MAKEFILES="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_MAKEFILES)" dnl FIXME sourcing this 3 times in subshells seems inefficient.
GNUSTEP_SYSTEM_HEADERS="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_MAKEFILES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_MAKEFILES)"
GNUSTEP_SYSTEM_LIBRARIES="$(. /etc/GNUstep/GNUstep.conf; echo $GNUSTEP_SYSTEM_LIBRARIES)" GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)"
GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)"
CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}" REAL_CFLAGS="$REAL_CFLAGS -I${GNUSTEP_SYSTEM_HEADERS}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment