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

Updated configure scripts for filesystem changes

Browse source 
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 Pero 2007-02-15 00:42:01 +00:00
parent e36c7b80c3
commit 37f73a3340
5 changed files with 64 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -2,10 +2,14 @@
* configure.ac (GNUSTEP_MAKE_CONFIG): Output errors to config.log * configure.ac (GNUSTEP_MAKE_CONFIG): Output errors to config.log
rather than printing them out. 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 * configure.ac: Source GNUstep.sh when we need to get the current
backwards compatibility settings) to compile. makefile setup. Use GNUSTEP_SYSTEM_HEADERS and
GNUSTEP_SYSTEM_LIBRARIES (with backwards compatibility settings)
to compile.
* SSL/configure.ac: Same changes.
* configure: Regenerated. * configure: Regenerated.
* SSL/configure: Regenerated.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com> 2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>

28
SSL/configure vendored
View file

@ -1348,15 +1348,35 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Miscellaneous flags # 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 if test "$GNUSTEP_IS_FLATTENED" = no; then
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os` clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu` clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os 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 else
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
fi fi
# #

28
SSL/configure.ac
View file

@ -40,15 +40,35 @@ AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Miscellaneous flags # 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 if test "$GNUSTEP_IS_FLATTENED" = no; then
clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os` clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu` clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os 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 else
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries GNUSTEP_LDIR=$GNUSTEP_SYSTEM_LIBRARIES
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_HEADERS
fi fi
# #

14
configure vendored
View file

@ -1718,21 +1718,20 @@ _ACEOF
# #
# Now load the values to be used in locating libraries etc used when # Now load the values to be used in locating libraries etc used when
# building the base library ... as supplied by the gnustep-make package # 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 # 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) # ask it to output all variables! That way we have access to (eg)
# GNUSTEP_SYSTEM_HEADERS below. # GNUSTEP_SYSTEM_HEADERS below.
# #
GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
. "$GNUSTEP_MAKEFILES/GNUstep.sh" . "$GNUSTEP_MAKEFILES/GNUstep.sh"
unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from # For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
# GNUSTEP_SYSTEM_ROOT if not set yet. # GNUSTEP_SYSTEM_ROOT if not set yet.
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
if test x"$GNUSTEP_IS_FLATTENED" = x""; then GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
else
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
fi
fi fi
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then 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 obj_dir=$clean_target_cpu/$clean_target_os
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir" GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
else else
obj_dir= obj_dir=
lobj_dir= lobj_dir=
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES" GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
fi fi
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
# #
# The following one is so that headers of custom libraries into # The following one is so that headers of custom libraries into
# $GNUSTEP_HDIR are used before the standard ones # $GNUSTEP_HDIR are used before the standard ones

11
configure.ac
View file

@ -282,11 +282,7 @@ unset GNUSTEP_SH_EXPORT_ALL_VARIABLES
# For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from # For backwards compatibility, define GNUSTEP_SYSTEM_HEADERS from
# GNUSTEP_SYSTEM_ROOT if not set yet. # GNUSTEP_SYSTEM_ROOT if not set yet.
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
if test x"$GNUSTEP_IS_FLATTENED" = x""; then GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
else
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
fi
fi fi
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then 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 obj_dir=$clean_target_cpu/$clean_target_os
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir" GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
else else
obj_dir= obj_dir=
lobj_dir= lobj_dir=
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES" GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
fi fi
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
# #
# The following one is so that headers of custom libraries into # The following one is so that headers of custom libraries into
# $GNUSTEP_HDIR are used before the standard ones # $GNUSTEP_HDIR are used before the standard ones