gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-26 10:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated reading default gnustep config file from make system

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23550 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola 2006-09-18 20:31:04 +00:00
parent f48277a2ff
commit f96e9a4acd
3 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -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> 2006-09-13 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSXML.m: Add hack to recognize apple plist info * Source/Additions/GSXML.m: Add hack to recognize apple plist info

14
configure vendored
View file

@ -1988,7 +1988,21 @@ test -n "$target_alias" &&
{ echo "$as_me:$LINENO: checking for GNUstep configuration file to use" >&5 { 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; } echo $ECHO_N "checking for GNUstep configuration file to use... $ECHO_C" >&6; }
GNUSTEP_CONFIG_FILE="" GNUSTEP_CONFIG_FILE=""
# 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/'` 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. # Check whether --with-config-file was given.
if test "${with_config_file+set}" = set; then if test "${with_config_file+set}" = set; then

15
configure.ac
View file

@ -56,7 +56,22 @@ AC_CANONICAL_TARGET([])
#--------------------------------------------------------------------- #---------------------------------------------------------------------
AC_MSG_CHECKING([for GNUstep configuration file to use]) AC_MSG_CHECKING([for GNUstep configuration file to use])
GNUSTEP_CONFIG_FILE="" GNUSTEP_CONFIG_FILE=""
# 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/'` GNUSTEP_MAKE_CONFIG=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
fi
AC_ARG_WITH(config-file, AC_ARG_WITH(config-file,
[ --with-config-file=PATH Specify path to the GNUstep config file. [ --with-config-file=PATH Specify path to the GNUstep config file.
This is the location to be used by the base This is the location to be used by the base