Fixup one error setting hard-coded paths on mingw

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24731 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-02-28 18:34:07 +00:00
parent 73c22c6b13
commit 08ac14b159
3 changed files with 6735 additions and 6505 deletions

View file

@ -1,3 +1,12 @@
2007-02-28 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Revert part of change which guaranteed use of bad
paths on mingw ... we allow a fallback to ./GNUstep.conf instead.
of using paths from make (which is guaranteed to be wrong as the
paths it uses are for msys and we need runtime paths for the
win32 api).
* configure: Regenerated.
2007-02-28 Nicola Pero <nicola.pero@meta-innovation.com>
* configure.ac: If no config file to import is specified, then

13217
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -222,12 +222,14 @@ then
GNUSTEP_DEFAULT_CONFIG="$result"
fi
if test "$GNUSTEP_DEFAULT_CONFIG" = ""; then
# Try the gnustep-make config file first. On MinGW this means
# we import the gnustep-make paths instead of paths from the non-existing
# ./GNUstep.conf file.
if test -f "$GNUSTEP_MAKE_CONFIG"; then
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_MAKE_CONFIG"
fi
# On platforms other than mingw we can fall back to GNUSTEP_CONFIG_FILE
# which (if undefined) will already have been set to the value of
# GNUSTEP_MAKE_CONFIG.
# On mingw we must never use GNUSTEP_MAKE_CONFIG ... as the paths from
# the make package are for building and are guaranteed to be wrong for
# use at runtime. We set $GNUSTEP_CONFIG_FILE to ./GNUstep.conf
# earlier to handle that case.
GNUSTEP_DEFAULT_CONFIG="$GNUSTEP_CONFIG_FILE"
fi
AC_MSG_RESULT($GNUSTEP_DEFAULT_CONFIG)