mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Added support for Boehm's garbage collector in libFoundation.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2804 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Ovidiu Predescu
parent
acf59bb30b
commit
a11eebe8cc
20 changed files with 169 additions and 54 deletions
29
ChangeLog
29
ChangeLog
|
|
@ -1,3 +1,32 @@
|
|||
Tue Apr 14 22:45:38 1998 Ovidiu Predescu <ovidiu@aracnet.com>
|
||||
|
||||
* test-tool.make (internal-testtool-check): New target.
|
||||
|
||||
Wed Apr 1 19:37:26 1998 Ovidiu Predescu <ovidiu@aracnet.com>
|
||||
|
||||
* bundle.make (xxx_PRINCIPAL_CLASS): New variable to support
|
||||
specifying the principal class of a bundle.
|
||||
* rules.make: Pass PRINCIPAL_CLASS down in the recursive make.
|
||||
* test-tool.make (internal-testtool-install): New empty rule.
|
||||
|
||||
Wed Mar 11 23:28:11 1998 Ovidiu Predescu <ovidiu@aracnet.com>
|
||||
|
||||
* brain.make: New makefile variable 'gc' used to specify the Boehm's
|
||||
garbage collector (currently works only with libFoundation).
|
||||
|
||||
* Added emacs variables at the end of makefile fragments.
|
||||
* Added the missing /bin/sh line in the shell scripts (bug report from
|
||||
Helge Hess <hh@mdlink.de>).
|
||||
|
||||
Wed Mar 4 22:48:04 1998 Ovidiu Predescu <ovidiu@aracnet.com>
|
||||
|
||||
* tool.make: Don't pass LIBFOUNDATION_GC_LIBRARY when linking the
|
||||
program.
|
||||
* test-library.make: Likewise.
|
||||
* brain.make (OBJC_LIBS): If working with libFoundation compiled
|
||||
with Boehm's garbage collector support, use a special Objective-C
|
||||
runtime library (libobjc_gc) and link against the gc library.
|
||||
|
||||
Fri May 15 12:00:27 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* application.make (APP_RESOURCE_DIRS): New variable.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#! /bin/sh
|
||||
#
|
||||
# MediaBook.sh
|
||||
#
|
||||
|
|
|
|||
|
|
@ -47,3 +47,7 @@ internal-all internal-install internal-uninstall internal-clean \
|
|||
|
||||
endif
|
||||
# aggregate.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -196,3 +196,7 @@ endif
|
|||
|
||||
endif
|
||||
# application.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
25
brain.make
25
brain.make
|
|
@ -37,6 +37,9 @@ ifeq ($(the_library_combo),)
|
|||
the_library_combo=$(library_combo)
|
||||
endif
|
||||
|
||||
ifeq ($(gc), yes)
|
||||
the_library_combo := $(the_library_combo)-gc
|
||||
endif
|
||||
|
||||
# Strip out the individual libraries from the combo string
|
||||
combo_list = $(subst -, ,$(the_library_combo))
|
||||
|
|
@ -65,7 +68,11 @@ ifneq ($(backend),)
|
|||
GUI_BACKEND_LIB = $(backend)
|
||||
endif
|
||||
|
||||
ifeq ($(gc), yes)
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)-gc
|
||||
else
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)
|
||||
endif
|
||||
|
||||
OBJC_LDFLAGS =
|
||||
OBJC_LIBS =
|
||||
|
|
@ -103,9 +110,21 @@ endif
|
|||
|
||||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
|
||||
|
||||
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
|
||||
FND_LDFLAGS =
|
||||
FND_LIBS = -lFoundation
|
||||
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
|
||||
|
||||
# If gc=yes was passed and libFoundation was compiled with Boehm's
|
||||
# GC support, use the appropriate libraries
|
||||
|
||||
ifeq ($(gc), yes)
|
||||
ifeq ($(LIBFOUNDATION_WITH_GC), yes)
|
||||
OBJC_LIBS = -lobjc_gc $(LIBFOUNDATION_GC_LIBRARY)
|
||||
AUXILIARY_CPPFLAGS += -DLIB_FOUNDATION_BOEHM_GC=1
|
||||
endif
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),nx)
|
||||
|
|
@ -183,3 +202,7 @@ SYSTEM_LIB_DIR =
|
|||
SYSTEM_LIBS = -ltiff -lwsock32 -ladvapi32 -lcomctl32 -luser32 \
|
||||
-lgdi32 -lcomdlg32
|
||||
endif
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
13
bundle.make
13
bundle.make
|
|
@ -32,6 +32,7 @@ include $(GNUSTEP_MAKEFILES)/rules.make
|
|||
# The name of the bundle is in the BUNDLE_NAME variable.
|
||||
# The list of bundle resource file are in xxx_RESOURCES
|
||||
# The list of bundle resource directories are in xxx_RESOURCE_DIRS
|
||||
# The name of the principal class is xxx_PRINCIPAL_CLASS
|
||||
# where xxx is the bundle name
|
||||
#
|
||||
|
||||
|
|
@ -97,10 +98,14 @@ $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
|
|||
bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
|
||||
@(if [ "$(RESOURCE_FILES)" != "" ]; then \
|
||||
echo "Copying resources into the bundle wrapper..."; \
|
||||
cp -r $(RESOURCE_FILES) $(BUNDLE_DIR_NAME)/Resources/$(RESOURCE_FILES); \
|
||||
cp -r $(RESOURCE_FILES) $(BUNDLE_DIR_NAME)/Resources; \
|
||||
fi)
|
||||
|
||||
|
||||
ifeq ($(PRINCIPAL_CLASS),)
|
||||
PRINCIPAL_CLASS = $(INTERNAL_bundle_NAME)
|
||||
endif
|
||||
|
||||
$(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
|
||||
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
|
||||
echo " NSExecutable = $(INTERNAL_bundle_NAME);"; \
|
||||
|
|
@ -109,7 +114,7 @@ $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist: $(BUNDLE_DIR_NAME)/Resources
|
|||
else \
|
||||
echo " NSMainNibFile = `echo $(MAIN_MODEL_FILE) | sed 's/.gmodel//'`;"; \
|
||||
fi; \
|
||||
echo " NSPrincipalClass = $(INTERNAL_bundle_NAME);"; \
|
||||
echo " NSPrincipalClass = $(PRINCIPAL_CLASS);"; \
|
||||
echo "}") >$@
|
||||
|
||||
internal-bundle-install:: $(BUNDLE_INSTALL_DIR)
|
||||
|
|
@ -137,3 +142,7 @@ endif
|
|||
|
||||
endif
|
||||
# bundle.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -298,3 +298,9 @@ GNUSTEP_TEXI2HTML = texi2html
|
|||
GNUSTEP_TEXI2HTML_FLAGS = -split_chapter -expandinfo
|
||||
GNUSTEP_DVIPS = dvips
|
||||
GNUSTEP_DVIPS_FLAGS =
|
||||
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
||||
|
|
|
|||
|
|
@ -73,3 +73,7 @@ endif
|
|||
|
||||
# Any user specified libs, like thread libraries
|
||||
CONFIG_SYSTEM_LIBS = @LIBS@
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
81
configure
vendored
81
configure
vendored
|
|
@ -20,11 +20,10 @@ ac_help="$ac_help
|
|||
--with-x use the X Window System"
|
||||
ac_help="$ac_help
|
||||
|
||||
|
||||
--with-library-combo
|
||||
Define the default library combinations that will be used when you type
|
||||
'make'. You can still change the library combination at runtime by
|
||||
specifying the 'library_combo' make variable. For example:
|
||||
Define the default library combinations that will be used when you
|
||||
type 'make'. You can still change the library combination at runtime
|
||||
by specifying the 'library_combo' make variable. For example:
|
||||
|
||||
$ make library_combo=nx-pdo-nx-nil
|
||||
"
|
||||
|
|
@ -615,7 +614,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
|||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:619: checking host system type" >&5
|
||||
echo "configure:618: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -636,7 +635,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:640: checking target system type" >&5
|
||||
echo "configure:639: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -654,7 +653,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:658: checking build system type" >&5
|
||||
echo "configure:657: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -683,7 +682,7 @@ test "$host_alias" != "$target_alias" &&
|
|||
# Extract the first word of "gcc", so it can be a program name with args.
|
||||
set dummy gcc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:687: checking for $ac_word" >&5
|
||||
echo "configure:686: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -712,7 +711,7 @@ if test -z "$CC"; then
|
|||
# Extract the first word of "cc", so it can be a program name with args.
|
||||
set dummy cc; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:716: checking for $ac_word" >&5
|
||||
echo "configure:715: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -760,7 +759,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:764: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
|
||||
ac_ext=c
|
||||
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
|
||||
|
|
@ -770,11 +769,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
|
|||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 774 "configure"
|
||||
#line 773 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -794,12 +793,12 @@ if test $ac_cv_prog_cc_works = no; then
|
|||
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
|
||||
fi
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
|
||||
echo "configure:798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:797: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
|
||||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||
echo "configure:803: checking whether we are using GNU C" >&5
|
||||
echo "configure:802: checking whether we are using GNU C" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -808,7 +807,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||
ac_cv_prog_gcc=yes
|
||||
else
|
||||
ac_cv_prog_gcc=no
|
||||
|
|
@ -823,7 +822,7 @@ if test $ac_cv_prog_gcc = yes; then
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:827: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:826: checking whether ${CC-cc} accepts -g" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -851,7 +850,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:855: checking how to run the C preprocessor" >&5
|
||||
echo "configure:854: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -866,13 +865,13 @@ else
|
|||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||
# not just through cpp.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 870 "configure"
|
||||
#line 869 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -883,13 +882,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 887 "configure"
|
||||
#line 886 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <assert.h>
|
||||
Syntax Error
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -914,7 +913,7 @@ echo "$ac_t""$CPP" 1>&6
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:918: checking for $ac_word" >&5
|
||||
echo "configure:917: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -952,7 +951,7 @@ fi
|
|||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||
# ./install, which can be erroneously created by make from ./install.sh.
|
||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||
echo "configure:956: checking for a BSD compatible install" >&5
|
||||
echo "configure:955: checking for a BSD compatible install" >&5
|
||||
if test -z "$INSTALL"; then
|
||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1012,7 +1011,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1016: checking whether ln -s works" >&5
|
||||
echo "configure:1015: checking whether ln -s works" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1041,7 +1040,7 @@ fi
|
|||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
echo $ac_n "checking for X""... $ac_c" 1>&6
|
||||
echo "configure:1045: checking for X" >&5
|
||||
echo "configure:1044: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
|
|
@ -1103,12 +1102,12 @@ if test "$ac_x_includes" = NO; then
|
|||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1107 "configure"
|
||||
#line 1106 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$x_direct_test_include>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1177,14 +1176,14 @@ if test "$ac_x_libraries" = NO; then
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1181 "configure"
|
||||
#line 1180 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
|
|
@ -1290,12 +1289,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
|
||||
echo "configure:1294: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1293: checking for $ac_hdr that defines DIR" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1299 "configure"
|
||||
#line 1298 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1303,7 +1302,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1328,7 +1327,7 @@ done
|
|||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||||
if test $ac_header_dirent = dirent.h; then
|
||||
echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
|
||||
echo "configure:1332: checking for opendir in -ldir" >&5
|
||||
echo "configure:1331: checking for opendir in -ldir" >&5
|
||||
ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1336,7 +1335,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1340 "configure"
|
||||
#line 1339 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1347,7 +1346,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1369,7 +1368,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1373: checking for opendir in -lx" >&5
|
||||
echo "configure:1372: checking for opendir in -lx" >&5
|
||||
ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1377,7 +1376,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1381 "configure"
|
||||
#line 1380 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -1388,7 +1387,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1414,17 +1413,17 @@ for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/s
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1418: checking for $ac_hdr" >&5
|
||||
echo "configure:1417: checking for $ac_hdr" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1423 "configure"
|
||||
#line 1422 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
|
|||
|
|
@ -85,11 +85,10 @@ AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
|||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(library-combo,[
|
||||
|
||||
--with-library-combo
|
||||
Define the default library combinations that will be used when you type
|
||||
'make'. You can still change the library combination at runtime by
|
||||
specifying the 'library_combo' make variable. For example:
|
||||
Define the default library combinations that will be used when you
|
||||
type 'make'. You can still change the library combination at runtime
|
||||
by specifying the 'library_combo' make variable. For example:
|
||||
|
||||
$ make library_combo=nx-pdo-nx-nil
|
||||
],
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ import-library::
|
|||
#
|
||||
internal-library-install:: internal-install-dirs internal-install-lib \
|
||||
internal-install-headers
|
||||
|
||||
|
||||
internal-install-dirs::
|
||||
$(GNUSTEP_MAKEFILES)/mkinstalldirs \
|
||||
$(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR) \
|
||||
|
|
@ -171,3 +171,7 @@ endif
|
|||
|
||||
endif
|
||||
# library.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -67,3 +67,7 @@ endif
|
|||
ifneq ($(arch),)
|
||||
export CLEANED_ARCH = $(foreach a, $(arch), $(shell $(CLEAN_CPU_SCRIPT) $(a)))
|
||||
endif
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -113,3 +113,7 @@ endif
|
|||
|
||||
endif
|
||||
# objc.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/sh
|
||||
#! /bin/sh
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -189,6 +189,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
RESOURCE_DIRS="$($*_RESOURCE_DIRS)" \
|
||||
BUNDLE_LIBS="$($*_BUNDLE_LIBS) $(BUNDLE_LIBS)" \
|
||||
BUNDLE_INSTALL_DIR="$($*_BUNDLE_INSTALL_DIR)" \
|
||||
PRINCIPAL_CLASS="$($*_PRINCIPAL_CLASS)" \
|
||||
ADDITIONAL_INCLUDE_DIRS="$(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$($*_INCLUDE_DIRS)" \
|
||||
ADDITIONAL_GUI_LIBS="$($*_GUI_LIBS) $(ADDITIONAL_GUI_LIBS)" \
|
||||
|
|
@ -236,3 +237,7 @@ endif
|
|||
|
||||
endif
|
||||
# rules.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -270,6 +270,7 @@ endif
|
|||
#
|
||||
####################################################
|
||||
|
||||
|
||||
####################################################
|
||||
#
|
||||
# HP-UX
|
||||
|
|
@ -294,3 +295,8 @@ endif
|
|||
#
|
||||
####################################################
|
||||
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
||||
|
|
|
|||
|
|
@ -66,3 +66,7 @@ endif
|
|||
|
||||
endif
|
||||
# test-application.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -64,5 +64,13 @@ internal-uninstall:: $(TEST_TOOL_NAME:=.uninstall.testtool.variables)
|
|||
|
||||
endif
|
||||
|
||||
internal-testtool-install::
|
||||
|
||||
internal-testtool-check::
|
||||
|
||||
endif
|
||||
# test-tool.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ internal-tool-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
|||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME): $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
|
||||
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \
|
||||
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
|
||||
$(LIBFOUNDATION_GC_LIBRARY) $(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
$(ALL_LIB_DIRS) $(ALL_TOOL_LIBS)
|
||||
|
||||
before-$(TARGET)-all::
|
||||
|
||||
|
|
@ -109,3 +109,7 @@ endif
|
|||
|
||||
endif
|
||||
# tool.make loaded
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
#! /bin/sh
|
||||
# transform_paths.sh
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
|
|
|
|||
Loading…
Reference in a new issue