mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 17:10:48 +00:00
Updated configure scripts for filesystem changes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24582 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nicola
parent
c678cfeb34
commit
e3da9fdc33
5 changed files with 64 additions and 27 deletions
10
ChangeLog
10
ChangeLog
|
|
@ -2,10 +2,14 @@
|
|||
|
||||
* configure.ac (GNUSTEP_MAKE_CONFIG): Output errors to config.log
|
||||
rather than printing them out.
|
||||
Source GNUstep.sh when we need to get the current makefile setup.
|
||||
Use GNUSTEP_SYSTEM_HEADERS and GNUSTEP_SYSTEM_LIBRARIES (with
|
||||
backwards compatibility settings) to compile.
|
||||
|
||||
* configure.ac: Source GNUstep.sh when we need to get the current
|
||||
makefile setup. Use GNUSTEP_SYSTEM_HEADERS and
|
||||
GNUSTEP_SYSTEM_LIBRARIES (with backwards compatibility settings)
|
||||
to compile.
|
||||
* SSL/configure.ac: Same changes.
|
||||
* configure: Regenerated.
|
||||
* SSL/configure: Regenerated.
|
||||
|
||||
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
|
|
|
|||
28
SSL/configure
vendored
28
SSL/configure
vendored
|
|
@ -1348,15 +1348,35 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|||
#--------------------------------------------------------------------
|
||||
# Miscellaneous flags
|
||||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
|
||||
#
|
||||
# It looks like we ought to source the whole GNUstep.sh here, and even
|
||||
# ask it to output all variables! That way we have access to (eg)
|
||||
# GNUSTEP_SYSTEM_HEADERS below.
|
||||
#
|
||||
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
|
||||
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
|
||||
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
||||
|
||||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
fi
|
||||
|
||||
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
||||
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -40,15 +40,35 @@ AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
|
|||
#--------------------------------------------------------------------
|
||||
# Miscellaneous flags
|
||||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
|
||||
#
|
||||
# It looks like we ought to source the whole GNUstep.sh here, and even
|
||||
# ask it to output all variables! That way we have access to (eg)
|
||||
# GNUSTEP_SYSTEM_HEADERS below.
|
||||
#
|
||||
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
|
||||
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
|
||||
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
||||
|
||||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_ROOT/Library/Libraries"
|
||||
fi
|
||||
|
||||
if test "$GNUSTEP_IS_FLATTENED" = no; then
|
||||
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
|
||||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
|||
14
configure
vendored
14
configure
vendored
|
|
@ -1718,21 +1718,20 @@ _ACEOF
|
|||
#
|
||||
# Now load the values to be used in locating libraries etc used when
|
||||
# building the base library ... as supplied by the gnustep-make package
|
||||
# (FIXME - review the whole idea).
|
||||
#
|
||||
# It looks like we ought to source the whole GNUstep.sh here, and even
|
||||
# ask it to output all variables! That way we have access to (eg)
|
||||
# GNUSTEP_SYSTEM_HEADERS below.
|
||||
#
|
||||
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
|
||||
. "$GNUSTEP_MAKEFILES/GNUstep.sh"
|
||||
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
||||
|
||||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test x"$GNUSTEP_IS_FLATTENED" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
|
|
@ -3052,15 +3051,14 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
|
|||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
else
|
||||
obj_dir=
|
||||
lobj_dir=
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
fi
|
||||
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
|
||||
#
|
||||
# The following one is so that headers of custom libraries into
|
||||
# $GNUSTEP_HDIR are used before the standard ones
|
||||
|
|
|
|||
11
configure.ac
11
configure.ac
|
|
@ -282,11 +282,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
|
|||
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
|
||||
# GNUSTEP_SYSTEM_ROOT if not set yet.
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test x"$GNUSTEP_IS_FLATTENED" = x""; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
|
|
@ -363,15 +359,14 @@ if test "$GNUSTEP_IS_FLATTENED" = no; then
|
|||
obj_dir=$clean_target_cpu/$clean_target_os
|
||||
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
else
|
||||
obj_dir=
|
||||
lobj_dir=
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
fi
|
||||
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
|
||||
#
|
||||
# The following one is so that headers of custom libraries into
|
||||
# $GNUSTEP_HDIR are used before the standard ones
|
||||
|
|
|
|||
Loading…
Reference in a new issue