From 583d63a776548e45e89c64ba5d04b0f6d56b2b89 Mon Sep 17 00:00:00 2001 From: rfm Date: Tue, 7 Mar 2006 10:58:10 +0000 Subject: [PATCH] Don't allow environment variable to confuse config file location. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22611 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 1 + configure | 1 + configure.ac | 1 + 3 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1df6fef95..36834c762 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ add comments to say that it may be deprecated in a later release if/when we move to using NSStream throughout. * configure.ac: minor documentation corrections. + Don't allow environment variable to confuse setup of file location. * configure: regenerated 2006-03-05 Richard Frith-Macdonald diff --git a/configure b/configure index a14d41169..2a570bbb5 100755 --- a/configure +++ b/configure @@ -1492,6 +1492,7 @@ test -n "$target_alias" && #--------------------------------------------------------------------- echo "$as_me:$LINENO: checking for GNUstep configuration file to use" >&5 echo $ECHO_N "checking for GNUstep configuration file to use... $ECHO_C" >&6 +GNUSTEP_CONFIG_FILE="" GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'` # Check whether --with-config-file or --without-config-file was given. diff --git a/configure.ac b/configure.ac index bc8433136..6ec0d3b3f 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AC_CANONICAL_TARGET([]) # Location of the GNUstep.conf config file (--with-config-file) #--------------------------------------------------------------------- AC_MSG_CHECKING([for GNUstep configuration file to use]) +GNUSTEP_CONFIG_FILE="" GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'` AC_ARG_WITH(config-file, [ --with-config-file=PATH Specify path to the GNUstep config file.