gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-17 11:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

produce sane values in the case where people use --without-config-file

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23146 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-07-07 13:22:37 +00:00
parent 0e65df2979
commit a31b4c8726
2 changed files with 7277 additions and 4725 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11538
configure vendored
View file

File diff suppressed because it is too large Load diff

26
configure.ac
View file

@ -77,15 +77,21 @@ AC_ARG_WITH(config-file,
If a trailing '/' is specified, the path is If a trailing '/' is specified, the path is
used for locating domains but no GNUstep used for locating domains but no GNUstep
config file is read at runtime.], config file is read at runtime.],
GNUSTEP_CONFIG_FILE="$withval", result="$withval",
[if test "$GNUSTEP_CONFIG_FILE" = ""; then result="no"
)
if test "$result" != "no"
then
GNUSTEP_CONFIG_FILE="$result"
fi
if test "$GNUSTEP_CONFIG_FILE" = ""; then
case "$target_os" in case "$target_os" in
mingw*) mingw*)
GNUSTEP_CONFIG_FILE=./GNUstep.conf ;; GNUSTEP_CONFIG_FILE=./GNUstep.conf ;;
*) *)
GNUSTEP_CONFIG_FILE="$GNUSTEP_MAKE_CONFIG" ;; GNUSTEP_CONFIG_FILE="$GNUSTEP_MAKE_CONFIG" ;;
esac esac
fi]) fi
AC_MSG_RESULT($GNUSTEP_CONFIG_FILE) AC_MSG_RESULT($GNUSTEP_CONFIG_FILE)
AC_SUBST(GNUSTEP_CONFIG_FILE) AC_SUBST(GNUSTEP_CONFIG_FILE)
@ -179,13 +185,19 @@ then
to use at runtime if no GNUstep config file to use at runtime if no GNUstep config file
is found at runtime. If this is not specified is found at runtime. If this is not specified
then the path from --with-config-file or from then the path from --with-config-file or from
the gnustep-make pacakage is used.], the gnustep-make package is used.],
GNUSTEP_DEFAULT_CONFIG="$withval", result="$withval",
[if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then result="no"
)
if test "$result" != "no"
then
GNUSTEP_DEFAULT_CONFIG="$result"
fi
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
if test -f "$GNUSTEP_CONFIG_FILE"; then if test -f "$GNUSTEP_CONFIG_FILE"; then
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE" GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
fi fi
fi]) fi
AC_MSG_RESULT($GNUSTEP_DEFAULT_CONFIG) AC_MSG_RESULT($GNUSTEP_DEFAULT_CONFIG)
# #