gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix test for libobjc. Prerelease 0.9.0

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@8684 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2001-01-18 19:47:40 +00:00
parent c6d1477987
commit 7e35160a17
5 changed files with 261 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2001-01-17 Adam Fedor <fedor@gnu.org>
* Version: Prerelease version 0.9.0
* configure.in: Change check for installed libobjc to match gstep-make
Thu Jan 18 15:53:41 2001 Nicola Pero <nicola@brainstorm.co.uk>
* Source/GNUmakefile: Simplified name to gnustep-base.

2
Documentation/coding-standards.texi
View file

@ -275,7 +275,7 @@ TEST_RELEASE(object) to release an object if it is non-nil
@item
TEST_AUTORELEASE(object) to autorelease an object if it is non-nil
@item
CREATE_AUTORELEASE_POOL(name) to create an autorelease pool wiyth the
CREATE_AUTORELEASE_POOL(name) to create an autorelease pool with the
specified name.
@item IF_NO_GC(X) compile the code 'X' only if GarbageCollection is not
in use.

4
Version
View file

@ -6,8 +6,8 @@ GCC_VERSION=2.8.0
# The version number of this release.
MAJOR_VERSION=0
MINOR_VERSION=6
SUBMINOR_VERSION=6
MINOR_VERSION=9
SUBMINOR_VERSION=0
GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
VERSION=${GNUSTEP_BASE_VERSION}

463
configure vendored
View file

File diff suppressed because it is too large Load diff

41
configure.in
View file

@ -180,31 +180,29 @@ AC_DEFINE_UNQUOTED(NeXT_cc, $NeXT_cc)
AC_SUBST(NEXT_INCLUDES)
#--------------------------------------------------------------------
# Check for alternate Objective-C libraries
# Miscellaneous flags
#--------------------------------------------------------------------
if test x$GNUSTEP_SYSTEM_ROOT != "x"; then
gnustep_obj_dir=${target_cpu}/${target_os}/${ac_cv_library_combo}
# May have a private version of libobj installed here
if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers"
LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_ROOT/Libraries/$gnustep_obj_dir"
echo "Using Objective-C library from $GNUSTEP_SYSTEM_ROOT, if available"
fi
# 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
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
fi
#--------------------------------------------------------------------
# Check if Objective-C is installed
#--------------------------------------------------------------------
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
# If so, there are probably other libraries that we want there also, so
# leave the proper includes in CPPFLAGS and LDFLAGS
AC_MSG_CHECKING(for alternate objc library)
AC_CACHE_VAL(gs_cv_objc_libdir,
[dnl
gs_cv_objc_libdir=NONE
if test -f $GNUSTEP_SYSTEM_ROOT/Headers/objc/objc.h; then
clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
obj_dir=$clean_target_cpu/$clean_target_os/$ac_cv_library_combo
if test -f $GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir/libobjc.a; then
gs_cv_objc_libdir=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
if test -f $GNUSTEP_HDIR/objc/objc.h; then
if test -f $GNUSTEP_LDIR/libobjc.a -o -f $GNUSTEP_LDIR/libobjc.so; then
gs_cv_objc_libdir=$GNUSTEP_LDIR
else
gs_cv_objc_libdir=NONE
fi
@ -213,10 +211,13 @@ fi
AC_MSG_RESULT($gs_cv_objc_libdir)
if test "$gs_cv_objc_libdir" != "NONE"; then
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers/"
LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR"
fi
#--------------------------------------------------------------------
# Check if Objective-C is installed
#--------------------------------------------------------------------
AC_CHECK_HEADERS(objc/objc.h)
if test $ac_cv_header_objc_objc_h = no; then
echo "Could not find Objective-C headers"