From f96e9a4acd88da7a11cc1a4eff4db9c687e374dc Mon Sep 17 00:00:00 2001
From: nicola <nicola@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 18 Sep 2006 20:31:04 +0000
Subject: [PATCH] Updated reading default gnustep config file from make system

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23550 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog    |  8 ++++++++
 configure    | 16 +++++++++++++++-
 configure.ac | 17 ++++++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 866c09d38..e76452ae3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-18  Nicola Pero <nicola.pero@meta-innovation.com>
+
+	* configure.ac (GNUSTEP_MAKE_CONFIG): Get this config from
+	config-noarch.make (requires gnustep-make > 1.13.0).  If failing,
+	fall back to taking it from $GNUSTEP_MAKEFILES/config.make as it
+	was done before (works with gnustep-make < 1.13.0 only though).
+	* configure: Regenerated.
+
 2006-09-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Additions/GSXML.m: Add hack to recognize apple plist info
diff --git a/configure b/configure
index a2eced193..1d2451476 100755
--- a/configure
+++ b/configure
@@ -1988,7 +1988,21 @@ 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/'`
+
+# This requires gnustep-make > 1.13.0 to work.  For gnustep-make =
+# 1.13.0 we would have to parse
+# $GNUSTEP_MAKEFILES/$obj_dir/config.make, but $obj_dir is not defined
+# yet at this stage in config, not sure if it's worth trying to make
+# it work.  For gnustep-make < 1.13.0 we would have to parse
+# $GNUSTEP_MAKEFILES/config.make.
+GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config-noarch.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
+
+# So, for backwards compatiblity, we try the plain config.make too.
+# This should work with gnustep-make < 1.13.0, and with 1.13.0 too if
+# they haven't deleted the file.
+if test "$GNUSTEP_MAKE_CONFIG"  = ""; then
+  GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
+fi
 
 # Check whether --with-config-file was given.
 if test "${with_config_file+set}" = set; then
diff --git a/configure.ac b/configure.ac
index 0614e4304..473a55717 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,22 @@ AC_CANONICAL_TARGET([])
 #---------------------------------------------------------------------
 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/'`
+
+# This requires gnustep-make > 1.13.0 to work.  For gnustep-make =
+# 1.13.0 we would have to parse
+# $GNUSTEP_MAKEFILES/$obj_dir/config.make, but $obj_dir is not defined
+# yet at this stage in config, not sure if it's worth trying to make
+# it work.  For gnustep-make < 1.13.0 we would have to parse
+# $GNUSTEP_MAKEFILES/config.make.
+GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config-noarch.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
+
+# So, for backwards compatiblity, we try the plain config.make too.
+# This should work with gnustep-make < 1.13.0, and with 1.13.0 too if
+# they haven't deleted the file.
+if test "$GNUSTEP_MAKE_CONFIG"  = ""; then
+  GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
+fi
+
 AC_ARG_WITH(config-file,
 [  --with-config-file=PATH       Specify path to the GNUstep config file.
 				This is the location to be used by the base