mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-23 09:04:13 +00:00
Use the new GNUSTEP_IS_FLATTENED variable, and default to flattened if nothing better specified
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23719 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
cfaf083d90
commit
6aec2db2f8
7 changed files with 58 additions and 26 deletions
26
ChangeLog
26
ChangeLog
|
|
@ -1,3 +1,29 @@
|
|||
2006-10-02 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
More work on having the default flattened gnustep build with just
|
||||
GNUSTEP_MAKEFILES set. Non-flattened builds will still require
|
||||
sourcing GNUstep.sh before configure instead.
|
||||
|
||||
* configure.ac: Use new variable GNUSTEP_IS_FLATTENED instead
|
||||
of GNUSTEP_FLATTENED, defaulting now to 'yes'. To build
|
||||
non-flattened you have to source GNUstep.sh first.
|
||||
* configure.ac (config.make): When determining objc threading
|
||||
flags in non-flattened mode, look for config.make in a
|
||||
library-combo subdir since that's where it is installed by
|
||||
gnustep-make now.
|
||||
* configure.ac: Extended the error message when the GNUstep conf
|
||||
file is not found.
|
||||
* configure: Regenerated.
|
||||
|
||||
* SSL/configure.ac: Use GNUSTEP_IS_FLATTENED instead of
|
||||
GNUSTEP_FLATTENED.
|
||||
* SSL/configure: Regenerated.
|
||||
|
||||
* Source/GNUmakefile: Renamed -DGNUSTEP_FLATTENED to
|
||||
-DGNUSTEP_IS_FLATTENED. This is just for consistency
|
||||
with the new gnustep-make variable name.
|
||||
* Source/NSPathUtilities.m: Same changes.
|
||||
|
||||
2006-09-28 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Source/NSBundle.m: Fix for buffer resize error when registering
|
||||
|
|
|
|||
6
SSL/configure
vendored
6
SSL/configure
vendored
|
|
@ -1350,13 +1350,13 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
|
|||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
else
|
||||
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
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -42,13 +42,13 @@ AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
|
|||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
else
|
||||
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
|
||||
else
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ ifeq ($(GNUSTEP_TARGET_OS), mingw32)
|
|||
DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
|
||||
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
|
||||
-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
|
||||
-DGNUSTEP_FLATTENED=\"$(GNUSTEP_FLATTENED)\" \
|
||||
-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
|
||||
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
|
||||
|
||||
|
||||
|
|
@ -71,7 +71,7 @@ else
|
|||
DEFS= -DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
|
||||
-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
|
||||
-DGNUSTEP_TARGET_OS=\"$(GNUSTEP_TARGET_OS)\" \
|
||||
-DGNUSTEP_FLATTENED=\"$(GNUSTEP_FLATTENED)\" \
|
||||
-DGNUSTEP_IS_FLATTENED=\"$(GNUSTEP_IS_FLATTENED)\" \
|
||||
-DLIBRARY_COMBO=\"$(LIBRARY_COMBO)\"
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -111,9 +111,9 @@ static NSString *library_combo =
|
|||
#else
|
||||
nil;
|
||||
#endif
|
||||
static NSString *gnustep_flattened =
|
||||
#ifdef GNUSTEP_FLATTENED
|
||||
@GNUSTEP_FLATTENED;
|
||||
static NSString *gnustep_is_flattened =
|
||||
#ifdef GNUSTEP_IS_FLATTENED
|
||||
@GNUSTEP_IS_FLATTENED;
|
||||
#else
|
||||
nil;
|
||||
#endif
|
||||
|
|
@ -1647,7 +1647,7 @@ if (domainMask & mask) \
|
|||
NSString *part = nil;
|
||||
|
||||
gslibsDir = [libraryDir stringByAppendingPathComponent: libsDir];
|
||||
if ([gnustep_flattened boolValue] == NO
|
||||
if ([gnustep_is_flattened boolValue] == NO
|
||||
&& gnustep_target_cpu != nil && gnustep_target_os != nil)
|
||||
{
|
||||
part = [gnustep_target_cpu stringByAppendingPathComponent:
|
||||
|
|
@ -1684,7 +1684,7 @@ if (domainMask & mask) \
|
|||
NSString *full = nil;
|
||||
NSString *part = nil;
|
||||
|
||||
if ([gnustep_flattened boolValue] == NO
|
||||
if ([gnustep_is_flattened boolValue] == NO
|
||||
&& gnustep_target_cpu != nil && gnustep_target_os != nil)
|
||||
{
|
||||
part = [gnustep_target_cpu stringByAppendingPathComponent:
|
||||
|
|
|
|||
15
configure
vendored
15
configure
vendored
|
|
@ -2214,7 +2214,7 @@ _ACEOF
|
|||
# building the base library ... as supplied by the gnustep-make package
|
||||
#
|
||||
if test ! -f "$GNUSTEP_MAKE_CONFIG"; then
|
||||
{ echo "$as_me:$LINENO: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now..." >&5
|
||||
{ echo "$as_me:$LINENO: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now... but it will probably fail later on" >&5
|
||||
echo "$as_me: Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now..." >&6;}
|
||||
else
|
||||
. "$GNUSTEP_MAKE_CONFIG"
|
||||
|
|
@ -3628,15 +3628,18 @@ fi
|
|||
# Miscellaneous flags
|
||||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
|
||||
else
|
||||
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
|
||||
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO
|
||||
else
|
||||
obj_dir=
|
||||
lobj_dir=
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
@ -4424,7 +4427,7 @@ echo $ECHO_N "checking for objc threading flags... $ECHO_C" >&6; }
|
|||
#
|
||||
# Get them from gnustep-make which contains the real code to get them
|
||||
#
|
||||
objc_threaded=`grep objc_threaded: $GNUSTEP_MAKEFILES/$obj_dir/config.make | sed -e 's/objc_threaded:=//'`
|
||||
objc_threaded=`grep objc_threaded: $GNUSTEP_MAKEFILES/$lobj_dir/config.make | sed -e 's/objc_threaded:=//'`
|
||||
#
|
||||
{ echo "$as_me:$LINENO: result: $objc_threaded" >&5
|
||||
echo "${ECHO_T}$objc_threaded" >&6; }
|
||||
|
|
|
|||
17
configure.ac
17
configure.ac
|
|
@ -201,7 +201,7 @@ then
|
|||
is found at runtime. If this is not specified
|
||||
then the path from --with-config-file or from
|
||||
the gnustep-make package is used.],
|
||||
result="$withval",
|
||||
result="$withval",
|
||||
result="no"
|
||||
)
|
||||
if test "$result" != "no"
|
||||
|
|
@ -271,7 +271,7 @@ AC_DEFINE_UNQUOTED(GNUSTEP_TARGET_CONFIG_FILE,
|
|||
# building the base library ... as supplied by the gnustep-make package
|
||||
#
|
||||
if test ! -f "$GNUSTEP_MAKE_CONFIG"; then
|
||||
AC_MSG_NOTICE([Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now...])
|
||||
AC_MSG_NOTICE([Could not find make-specified config file. Either make was installed incorrectly or you are using an old version of gnustep-make. Ignoring this for now... but it will probably fail later on])
|
||||
else
|
||||
. "$GNUSTEP_MAKE_CONFIG"
|
||||
fi
|
||||
|
|
@ -340,15 +340,18 @@ fi
|
|||
# Miscellaneous flags
|
||||
#--------------------------------------------------------------------
|
||||
# Set location of GNUstep dirs for later use
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
|
||||
else
|
||||
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
|
||||
lobj_dir=$clean_target_cpu/$clean_target_os/$LIBRARY_COMBO
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO
|
||||
else
|
||||
obj_dir=
|
||||
lobj_dir=
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
|
||||
fi
|
||||
|
||||
#
|
||||
|
|
@ -422,7 +425,7 @@ AC_MSG_CHECKING(for objc threading flags)
|
|||
#
|
||||
# Get them from gnustep-make which contains the real code to get them
|
||||
#
|
||||
objc_threaded=`grep objc_threaded: $GNUSTEP_MAKEFILES/$obj_dir/config.make | sed -e 's/objc_threaded:=//'`
|
||||
objc_threaded=`grep objc_threaded: $GNUSTEP_MAKEFILES/$lobj_dir/config.make | sed -e 's/objc_threaded:=//'`
|
||||
#
|
||||
AC_MSG_RESULT($objc_threaded)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue