mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Check in Network and Local (as well as System) when looking for a custom ObjC shared library. I thought I had committed this fix weeks ago, but it's not on trunk. It needs testing - I can't test much right now but don't want to keep it on my machine for more weeks
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@25177 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
047e647e40
commit
1bf361d357
3 changed files with 112 additions and 32 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2007-05-12 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac: When checking for the custom ObjC runtime library,
|
||||
check in Network and Local as well as System.
|
||||
* configure: Regenerated.
|
||||
|
||||
2007-05-11 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* common.make: correct the os/architecture specific header
|
||||
|
|
|
|||
69
configure
vendored
69
configure
vendored
|
|
@ -4077,16 +4077,10 @@ fi
|
|||
# Miscellaneous flags and setup
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of System GNUstep dirs for later use
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
else
|
||||
if test "$GNUSTEP_IS_FLATTENED" != yes; then
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_LIBRARIES.
|
||||
|
|
@ -4098,11 +4092,54 @@ if test "${gs_cv_objc_libdir+set}" = set; then
|
|||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
gs_cv_objc_libdir=NONE
|
||||
gs_cv_objc_incdir=NONE
|
||||
# Try GNUSTEP_SYSTEM_LIBRARIES first
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
else
|
||||
gs_cv_objc_libdir=NONE
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try GNUSTEP_NETWORK_LIBRARIES second (override GNUSTEP_SYSTEM if
|
||||
# found)
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_NETWORK_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_NETWORK_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_NETWORK_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_NETWORK_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try GNUSTEP_LOCAL_LIBRARIES third (override GNUSTEP_SYSTEM and
|
||||
# GNUSTEP_NETWORK if found)
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_LOCAL_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_LOCAL_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_LOCAL_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_LOCAL_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
#gcc_shared_libobjc=`gcc -print-file-name=libobjc.so`
|
||||
|
|
@ -4115,15 +4152,15 @@ fi
|
|||
echo "$as_me:$LINENO: result: $gs_cv_objc_libdir" >&5
|
||||
echo "${ECHO_T}$gs_cv_objc_libdir" >&6
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_HDIR"
|
||||
if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
# The following are needed to compile the test programs
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$gs_cv_objc_incdir"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if libobjc was compiled with thread support.
|
||||
|
|
|
|||
69
configure.ac
69
configure.ac
|
|
@ -890,16 +890,10 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
# Miscellaneous flags and setup
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of System GNUstep dirs for later use
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
else
|
||||
if test "$GNUSTEP_IS_FLATTENED" != yes; then
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_LIBRARIES.
|
||||
|
|
@ -909,11 +903,54 @@ AC_MSG_CHECKING(for custom shared objc library)
|
|||
AC_CACHE_VAL(gs_cv_objc_libdir,
|
||||
[dnl
|
||||
gs_cv_objc_libdir=NONE
|
||||
gs_cv_objc_incdir=NONE
|
||||
# Try GNUSTEP_SYSTEM_LIBRARIES first
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
else
|
||||
gs_cv_objc_libdir=NONE
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try GNUSTEP_NETWORK_LIBRARIES second (override GNUSTEP_SYSTEM if
|
||||
# found)
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_NETWORK_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_NETWORK_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_NETWORK_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_NETWORK_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Try GNUSTEP_LOCAL_LIBRARIES third (override GNUSTEP_SYSTEM and
|
||||
# GNUSTEP_NETWORK if found)
|
||||
if test "$GNUSTEP_IS_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_LOCAL_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_LOCAL_HEADERS"
|
||||
else
|
||||
GNUSTEP_LDIR="$GNUSTEP_LOCAL_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_LOCAL_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
if test -f "$GNUSTEP_HDIR/objc/objc.h"; then
|
||||
if test -f "$GNUSTEP_LDIR/libobjc.a" -o -f "$GNUSTEP_LDIR/libobjc.so" -o -f "$GNUSTEP_LDIR/libobjc.dll.a" -o -f "$GNUSTEP_LDIR/libobjc-gnu.dylib"; then
|
||||
gs_cv_objc_libdir="$GNUSTEP_LDIR"
|
||||
gs_cv_objc_incdir="$GNUSTEP_HDIR"
|
||||
fi
|
||||
fi
|
||||
#gcc_shared_libobjc=`gcc -print-file-name=libobjc.so`
|
||||
|
|
@ -923,15 +960,15 @@ fi
|
|||
])
|
||||
AC_MSG_RESULT($gs_cv_objc_libdir)
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_HDIR"
|
||||
if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
# The following are needed to compile the test programs
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$gs_cv_objc_incdir"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
# And the following to execute them
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$gs_cv_objc_libdir"
|
||||
export LD_LIBRARY_PATH
|
||||
fi
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Check if libobjc was compiled with thread support.
|
||||
|
|
|
|||
Loading…
Reference in a new issue