From 37f73a3340bb718d768b82037170af4425169c01 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Thu, 15 Feb 2007 00:42:01 +0000 Subject: [PATCH] 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 --- ChangeLog | 10 +++++++--- SSL/configure | 28 ++++++++++++++++++++++++---- SSL/configure.ac | 28 ++++++++++++++++++++++++---- configure | 14 ++++++-------- configure.ac | 11 +++-------- 5 files changed, 64 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 406a571ae..fe841b050 100644 --- a/ChangeLog +++ b/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 diff --git a/SSL/configure b/SSL/configure index d9cf8874a..face9fd36 100755 --- a/SSL/configure +++ b/SSL/configure @@ -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 # diff --git a/SSL/configure.ac b/SSL/configure.ac index d3f92e8e0..9c7fe854d 100644 --- a/SSL/configure.ac +++ b/SSL/configure.ac @@ -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 # diff --git a/configure b/configure index d854fc261..847bfcfff 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.ac b/configure.ac index 7820ad7b4..1a8f5912c 100644 --- a/configure.ac +++ b/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