mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 00:41:02 +00:00
Make config relative to the base library on mingw by default.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22161 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald
parent
37e6e3f50e
commit
0d159eccf7
3 changed files with 56 additions and 34 deletions
|
|
@ -1,3 +1,11 @@
|
|||
2005-12-06 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* configure.ac: On mingw, don't get the location of the config file
|
||||
from the make package. Assume ./GNUstep.conf instead, so that the
|
||||
base library is built for distribution (relocatable relative to the
|
||||
library).
|
||||
* configure: regenerate
|
||||
|
||||
2005-12-05 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSProcessInfo.m: Allow
|
||||
|
|
|
|||
41
configure
vendored
41
configure
vendored
|
|
@ -1370,7 +1370,12 @@ if test "${with_config_file+set}" = set; then
|
|||
GNUSTEP_CONFIG_FILE="$withval"
|
||||
else
|
||||
if test "$GNUSTEP_CONFIG_FILE" = ""; then
|
||||
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_CONFIG_FILE=./GNUstep.conf ;;
|
||||
*)
|
||||
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'` ;;
|
||||
esac
|
||||
fi
|
||||
fi;
|
||||
echo "$as_me:$LINENO: result: $GNUSTEP_CONFIG_FILE" >&5
|
||||
|
|
@ -1409,24 +1414,26 @@ fi
|
|||
|
||||
#
|
||||
# Set 'standard' defaults for values from configuration file.
|
||||
# On mingw, we assume paths for an isolated, standalone, relocatable package.
|
||||
# On unix we assume a standard layout for both development and distribution.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=C:\\GNUstep\\System
|
||||
GNUSTEP_LOCAL_ROOT=C:\\GNUstep\\Local
|
||||
GNUSTEP_NETWORK_ROOT=C:\\GNUstep\\Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=./System
|
||||
GNUSTEP_LOCAL_ROOT=./Local
|
||||
GNUSTEP_NETWORK_ROOT=./Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
esac
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
|
|
|
|||
41
configure.ac
41
configure.ac
|
|
@ -53,7 +53,12 @@ AC_ARG_WITH(config-file,
|
|||
config file is read at runtime.],
|
||||
GNUSTEP_CONFIG_FILE="$withval",
|
||||
[if test "$GNUSTEP_CONFIG_FILE" = ""; then
|
||||
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'`
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_CONFIG_FILE=./GNUstep.conf ;;
|
||||
*)
|
||||
GNUSTEP_CONFIG_FILE=`grep '^GNUSTEP_CONFIG_FILE *=' $GNUSTEP_MAKEFILES/config.make | sed -e 's/GNUSTEP_CONFIG_FILE *= *\(.*\)/\1/'` ;;
|
||||
esac
|
||||
fi])
|
||||
AC_MSG_RESULT($GNUSTEP_CONFIG_FILE)
|
||||
AC_SUBST(GNUSTEP_CONFIG_FILE)
|
||||
|
|
@ -88,24 +93,26 @@ fi
|
|||
|
||||
#
|
||||
# Set 'standard' defaults for values from configuration file.
|
||||
# On mingw, we assume paths for an isolated, standalone, relocatable package.
|
||||
# On unix we assume a standard layout for both development and distribution.
|
||||
#
|
||||
case "$target_os" in
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=C:\\GNUstep\\System
|
||||
GNUSTEP_LOCAL_ROOT=C:\\GNUstep\\Local
|
||||
GNUSTEP_NETWORK_ROOT=C:\\GNUstep\\Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
mingw*)
|
||||
GNUSTEP_SYSTEM_ROOT=./System
|
||||
GNUSTEP_LOCAL_ROOT=./Local
|
||||
GNUSTEP_NETWORK_ROOT=./Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep\\Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
*)
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep/System
|
||||
GNUSTEP_LOCAL_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_NETWORK_ROOT=/usr/GNUstep/Local
|
||||
GNUSTEP_USER_DIR=GNUstep
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
;;
|
||||
esac
|
||||
|
||||
#---------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue