mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Port fixes from trunk
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/branches/stable@25194 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
708e17e48a
commit
714f1bb48a
12 changed files with 177 additions and 58 deletions
41
ChangeLog
41
ChangeLog
|
@ -1,3 +1,44 @@
|
|||
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
|
||||
directory for non-flattened compilation. Needs to be a subdirectory
|
||||
of the library-combo directory and wasn't.
|
||||
|
||||
2007-05-02 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* FilesystemLayouts/fhs-system: Added missing xxx_WEB_APPS
|
||||
variables (Reported by Stefan Bidigaray <stefanbidi@gmail.com>).
|
||||
Fixed xxx_APPS variables to use 'Applications' and not 'Apps'.
|
||||
|
||||
2007-05-01 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* FilesystemLayouts/gnustep (GNUSTEP_USER_DIR_DOC,
|
||||
GNUSTEP_USER_DIR_DOC_INFO, GNUSTEP_USER_DIR_DOC_MAN): Added
|
||||
the Library part of the path which was missing.
|
||||
* FilesystemLayouts/gnustep-with-network: Same changes.
|
||||
* FilesystemLayouts/fhs-system: Same changes.
|
||||
* FilesystemLayouts/fhs: Same changes.
|
||||
* FilesystemLayouts/mac: Same changes.
|
||||
|
||||
2007-04-18 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
Fixed installing headers of a framework's subproject when the
|
||||
framework has the default version (Problem reported by David
|
||||
Wetzel <dave@turbocat.de>).
|
||||
* Master/rules.make (%.variables): Fixed default framework version used
|
||||
to copy headers from subprojects to frameworks.
|
||||
(%.subprojects): Same change.
|
||||
|
||||
* Documentation/releasenotes.texi: Fixed documentation on the new
|
||||
default framework resource version.
|
||||
* RELEASENOTES: Same change.
|
||||
|
||||
2007-04-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Version 2.0.0 (Updated)
|
||||
|
|
|
@ -87,7 +87,7 @@ can automatically detect plists that need preprocessing.
|
|||
|
||||
@item Framework default version
|
||||
The default framework resource version changed from 'A' to
|
||||
INTERFACE_VERSION (which is set, by default, to '0.0').
|
||||
INTERFACE_VERSION (which is set, by default, to '0').
|
||||
|
||||
@item Microsoft Windows updates
|
||||
If you are using Microsoft Windows, you probably want to check
|
||||
|
|
|
@ -75,8 +75,8 @@ GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
|||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
|
|
|
@ -40,8 +40,9 @@ GNUSTEP_LOCAL_USERS_DIR=/home
|
|||
# paths.
|
||||
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
|
||||
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Apps
|
||||
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Applications
|
||||
GNUSTEP_SYSTEM_WEB_APPS=/lib/GNUstep/WebApplications
|
||||
GNUSTEP_SYSTEM_TOOLS=/bin
|
||||
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
|
||||
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
|
||||
|
@ -51,8 +52,9 @@ GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
|
|||
GNUSTEP_SYSTEM_DOC_MAN=/man
|
||||
GNUSTEP_SYSTEM_DOC_INFO=/info
|
||||
|
||||
GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Applications
|
||||
GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Applications
|
||||
GNUSTEP_NETWORK_WEB_APPS=/lib/GNUstep/WebApplications
|
||||
GNUSTEP_NETWORK_TOOLS=/local/bin
|
||||
GNUSTEP_NETWORK_ADMIN_TOOLS=/local/sbin
|
||||
GNUSTEP_NETWORK_LIBRARY=/local/lib/GNUstep
|
||||
|
@ -62,8 +64,9 @@ GNUSTEP_NETWORK_DOC=/local/share/GNUstep/Documentation
|
|||
GNUSTEP_NETWORK_DOC_MAN=/local/man
|
||||
GNUSTEP_NETWORK_DOC_INFO=/local/info
|
||||
|
||||
GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Apps
|
||||
GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Applications
|
||||
GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Applications
|
||||
GNUSTEP_LOCAL_WEB_APPS=/local/lib/GNUstep/WebApplications
|
||||
GNUSTEP_LOCAL_TOOLS=/local/bin
|
||||
GNUSTEP_LOCAL_ADMIN_TOOLS=/local/sbin
|
||||
GNUSTEP_LOCAL_LIBRARY=/local/lib/GNUstep
|
||||
|
@ -75,13 +78,14 @@ GNUSTEP_LOCAL_DOC_INFO=/local/info
|
|||
|
||||
GNUSTEP_USER_DIR_APPS=GNUstep/Applications
|
||||
GNUSTEP_USER_DIR_ADMIN_APPS=GNUstep/Applications/Admin
|
||||
GNUSTEP_USER_DIR_WEB_APPS=GNUstep/WebApplications
|
||||
GNUSTEP_USER_DIR_TOOLS=GNUstep/Tools
|
||||
GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
||||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
|
|
|
@ -84,9 +84,9 @@ GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
|||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
|
||||
|
|
|
@ -78,9 +78,9 @@ GNUSTEP_USER_DIR_ADMIN_TOOLS=GNUstep/Tools/Admin
|
|||
GNUSTEP_USER_DIR_LIBRARY=GNUstep/Library
|
||||
GNUSTEP_USER_DIR_HEADERS=GNUstep/Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=GNUstep/Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Documentation/info
|
||||
GNUSTEP_USER_DIR_DOC=GNUstep/Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=GNUstep/Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=GNUstep/Library/Documentation/info
|
||||
GNUSTEP_USER_CONFIG_FILE=.GNUstep.conf
|
||||
GNUSTEP_USER_DEFAULTS_DIR=GNUstep/Defaults
|
||||
|
||||
|
|
|
@ -68,8 +68,8 @@ GNUSTEP_USER_DIR_ADMIN_TOOLS=sbin
|
|||
GNUSTEP_USER_DIR_LIBRARY=Library
|
||||
GNUSTEP_USER_DIR_HEADERS=Library/Headers
|
||||
GNUSTEP_USER_DIR_LIBRARIES=Library/Libraries
|
||||
GNUSTEP_USER_DIR_DOC=Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=Documentation/info
|
||||
GNUSTEP_USER_DIR_DOC=Library/Documentation
|
||||
GNUSTEP_USER_DIR_DOC_MAN=Library/Documentation/man
|
||||
GNUSTEP_USER_DIR_DOC_INFO=Library/Documentation/info
|
||||
GNUSTEP_USER_CONFIG_FILE=Library/.GNUstep.conf
|
||||
GNUSTEP_USER_DEFAULTS_DIR=Library/Defaults
|
||||
|
|
|
@ -295,7 +295,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
|
|||
if [ "$$framework_version" = "" ]; then \
|
||||
framework_version="$(word 1,$(subst ., ,$($(basename $(basename $*))_VERSION)))"; \
|
||||
if [ "$$framework_version" = "" ]; then \
|
||||
framework_version="0.0"; \
|
||||
framework_version="0"; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi; \
|
||||
|
@ -370,7 +370,7 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
|
|||
if [ "$$framework_version" = "" ]; then \
|
||||
framework_version="$(word 1,$(subst ., ,$($(basename $(basename $*))_VERSION)))"; \
|
||||
if [ "$$framework_version" = "" ]; then \
|
||||
framework_version="0.0"; \
|
||||
framework_version="0"; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi; \
|
||||
|
|
|
@ -91,7 +91,7 @@ configurations that are allowed by gnustep-make version 2.
|
|||
|
||||
`Framework default version'
|
||||
The default framework resource version changed from 'A' to
|
||||
INTERFACE_VERSION (which is set, by default, to '0.0').
|
||||
INTERFACE_VERSION (which is set, by default, to '0').
|
||||
|
||||
`Microsoft Windows updates'
|
||||
If you are using Microsoft Windows, you probably want to check the
|
||||
|
|
|
@ -308,7 +308,7 @@ ifeq ($(GNUSTEP_IS_FLATTENED), no)
|
|||
# Later, we'll systematically replace domain with USER, the LOCAL,
|
||||
# then NETWORK, then SYSTEM.
|
||||
GS_HEADER_PATH = \
|
||||
$(GNUSTEP_$(domain)_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_$(domain)_HEADERS)/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_$(domain)_HEADERS)/$(LIBRARY_COMBO) \
|
||||
$(GNUSTEP_$(domain)_HEADERS)
|
||||
|
||||
|
|
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