gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Moved --with-config-file=xxx option to gnustep-make

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21800 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-10-12 16:15:19 +00:00
parent 12b85b04b3
commit 46bf4de82e
3 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-10-12 Nicola Pero <n.pero@mi.flashnet.it>
* configure.ac (config_file): Get the location of the
configuration file from gnustep-make rather than from a
--with-config-file option. Everything works exactly as before,
but the --with-config-file option was moved to gnustep-make.
* configure: Regenerated.
2005-10-12 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPathUtilities.m: Remove backward compatibility hacks for

26
configure vendored
View file

@ -871,7 +871,6 @@ Optional Packages:
--with-gmp-library=PATH library path for gmp libraries
--with-openssl-include=PATH include path for openssl headers
--with-openssl-library=PATH library path for openssl libraries
--with-config-file=PATH path to GNUstep configuration file
Some influential environment variables:
CC C compiler command
@ -15777,22 +15776,15 @@ subdirs="$subdirs Source/mframe SSL"
#--------------------------------------------------------------------
# Configuration and Misc Options
#--------------------------------------------------------------------
# Check whether --with-config-file or --without-config-file was given.
if test "${with_config_file+set}" = set; then
withval="$with_config_file"
config_file="$withval"
else
config_file="no"
fi;
if test $config_file = no; then
case "$target_os" in
freebsd* | openbsd* ) config_file=/usr/etc/GNUstep.conf ;;
netbsd* ) config_file=/usr/pkg/etc ;;
*) config_file=/etc/GNUstep/GNUstep.conf;;
esac
fi
echo "$as_me:$LINENO: checking for location of GNUstep configuration file" >&5
echo $ECHO_N "checking for location of GNUstep configuration file... $ECHO_C" >&6
#
# Get them from gnustep-make which contains the real code to get them
#
config_file=$(grep GNUSTEP_CONFIG_FILE $GNUSTEP_MAKEFILES/$obj_dir/config.make | sed -e 's/GNUSTEP_CONFIG_FILE = //')
#
echo "$as_me:$LINENO: result: $config_file" >&5
echo "${ECHO_T}$config_file" >&6
cat >>confdefs.h <<_ACEOF
#define GNUSTEP_CONFIGURATION_FILE $config_file

18
configure.ac
View file

@ -1290,17 +1290,13 @@ AC_CONFIG_SUBDIRS(Source/mframe SSL)
#--------------------------------------------------------------------
# Configuration and Misc Options
#--------------------------------------------------------------------
AC_ARG_WITH(config-file,
[ --with-config-file=PATH path to GNUstep configuration file],
config_file="$withval", config_file="no")
if test $config_file = no; then
case "$target_os" in
freebsd* | openbsd* ) config_file=/usr/etc/GNUstep.conf ;;
netbsd* ) config_file=/usr/pkg/etc ;;
*) config_file=/etc/GNUstep/GNUstep.conf;;
esac
fi
AC_MSG_CHECKING(for location of GNUstep configuration file)
#
# Get them from gnustep-make which contains the real code to get them
#
config_file=$(grep GNUSTEP_CONFIG_FILE $GNUSTEP_MAKEFILES/$obj_dir/config.make | sed -e 's/GNUSTEP_CONFIG_FILE = //')
#
AC_MSG_RESULT($config_file)
AC_DEFINE_UNQUOTED(GNUSTEP_CONFIGURATION_FILE, $config_file,
[Set to location of the GNUstep configuration file])