mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Correct GNUSTEP_ROOT
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8914 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
3106ae38fd
commit
a9603538f8
4 changed files with 74 additions and 86 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2001-01-29 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Correct setting of prefix and GNUSTEP_ROOT.
|
||||
* GNUmakefile.in: Replace GNUSTEP_PREFIX with GNUSTEP_ROOT
|
||||
|
||||
Mon Jan 29 16:57:53 2001 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* GNUmakefile.in (install): Create the
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ include Version
|
|||
|
||||
prefix = @prefix@
|
||||
GNUSTEP_INSTALLATION_DIR=$(prefix)
|
||||
GNUSTEP_PREFIX = @GNUSTEP_PREFIX@
|
||||
GNUSTEP_ROOT = @GNUSTEP_ROOT@
|
||||
srcdir = @srcdir@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
|
|
@ -85,7 +85,7 @@ which_lib$(EXEEXT): which_lib.c
|
|||
$(CC) @CFLAGS@ -Wall -o $@ $^
|
||||
|
||||
install: all
|
||||
$(srcdir)/mkinstalldirs $(prefix) $(makedir) \
|
||||
$(srcdir)/mkinstalldirs $(GNUSTEP_ROOT) $(prefix) $(makedir) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_CPU) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(makedir)/Additional \
|
||||
|
|
@ -105,10 +105,10 @@ install: all
|
|||
$(prefix)/Documentation/User \
|
||||
$(prefix)/Documentation/info \
|
||||
$(prefix)/Documentation/man \
|
||||
$(GNUSTEP_PREFIX)/Local \
|
||||
$(GNUSTEP_PREFIX)/Local/Users \
|
||||
$(GNUSTEP_PREFIX)/Local/Users/Administrator \
|
||||
$(GNUSTEP_PREFIX)/Network
|
||||
$(GNUSTEP_ROOT)/Local \
|
||||
$(GNUSTEP_ROOT)/Local/Users \
|
||||
$(GNUSTEP_ROOT)/Local/Users/Administrator \
|
||||
$(GNUSTEP_ROOT)/Network
|
||||
$(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) $(makedir)/$(GNUSTEP_TARGET_DIR)
|
||||
for f in config.guess config.sub install-sh mkinstalldirs \
|
||||
GNUstep.sh MediaBook.sh clean_cpu.sh clean_os.sh \
|
||||
|
|
|
|||
127
configure
vendored
127
configure
vendored
|
|
@ -573,7 +573,6 @@ if test "x$prefix" = "xNONE"; then
|
|||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
GNUSTEP_PREFIX='$(prefix)'
|
||||
# Check whether --with-system-root or --without-system-root was given.
|
||||
if test "${with_system_root+set}" = set; then
|
||||
withval="$with_system_root"
|
||||
|
|
@ -588,18 +587,11 @@ if test $ac_cv_system_root = yes; then
|
|||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
else
|
||||
prefix=$prefix/System
|
||||
GNUSTEP_PREFIX='$(prefix)/..'
|
||||
fi
|
||||
else
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX="$(prefix)/.."
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Is the system flattened?
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -674,7 +666,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:678: checking host system type" >&5
|
||||
echo "configure:670: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -695,7 +687,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:699: checking target system type" >&5
|
||||
echo "configure:691: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -713,7 +705,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:717: checking build system type" >&5
|
||||
echo "configure:709: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -815,7 +807,7 @@ if test "x$target" != "x$host"; then
|
|||
# Extract the first word of ""${targetArgument}-gcc"", so it can be a program name with args.
|
||||
set dummy "${targetArgument}-gcc"; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:819: checking for $ac_word" >&5
|
||||
echo "configure:811: 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
|
||||
|
|
@ -845,7 +837,7 @@ fi
|
|||
# Extract the first word of ""${targetArgument}-ranlib"", so it can be a program name with args.
|
||||
set dummy "${targetArgument}-ranlib"; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:849: checking for $ac_word" >&5
|
||||
echo "configure:841: 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
|
||||
|
|
@ -875,7 +867,7 @@ fi
|
|||
# Extract the first word of ""${targetArgument}-ar"", so it can be a program name with args.
|
||||
set dummy "${targetArgument}-ar"; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:879: checking for $ac_word" >&5
|
||||
echo "configure:871: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -905,7 +897,7 @@ fi
|
|||
# Extract the first word of ""${targetArgument}-dlltool"", so it can be a program name with args.
|
||||
set dummy "${targetArgument}-dlltool"; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:909: checking for $ac_word" >&5
|
||||
echo "configure:901: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -936,7 +928,7 @@ else
|
|||
# Extract the first word of "ar", so it can be a program name with args.
|
||||
set dummy ar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:940: checking for $ac_word" >&5
|
||||
echo "configure:932: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -965,7 +957,7 @@ fi
|
|||
# Extract the first word of "dlltool", so it can be a program name with args.
|
||||
set dummy dlltool; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:969: checking for $ac_word" >&5
|
||||
echo "configure:961: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -994,7 +986,7 @@ fi
|
|||
# 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:998: checking for $ac_word" >&5
|
||||
echo "configure:990: 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
|
||||
|
|
@ -1026,7 +1018,7 @@ fi
|
|||
# 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:1030: checking for $ac_word" >&5
|
||||
echo "configure:1022: 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
|
||||
|
|
@ -1056,7 +1048,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:1060: checking for $ac_word" >&5
|
||||
echo "configure:1052: 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
|
||||
|
|
@ -1107,7 +1099,7 @@ fi
|
|||
# Extract the first word of "cl", so it can be a program name with args.
|
||||
set dummy cl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1111: checking for $ac_word" >&5
|
||||
echo "configure:1103: 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
|
||||
|
|
@ -1139,7 +1131,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1143: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1135: 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.
|
||||
|
|
@ -1150,12 +1142,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1154 "configure"
|
||||
#line 1146 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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
|
||||
|
|
@ -1181,12 +1173,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:1185: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1177: 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:1190: checking whether we are using GNU C" >&5
|
||||
echo "configure:1182: 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
|
||||
|
|
@ -1195,7 +1187,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1199: \"$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:1191: \"$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
|
||||
|
|
@ -1214,7 +1206,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:1218: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1210: 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
|
||||
|
|
@ -1246,7 +1238,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1250: checking how to run the C preprocessor" >&5
|
||||
echo "configure:1242: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -1261,13 +1253,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 1265 "configure"
|
||||
#line 1257 "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:1271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1278,13 +1270,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1282 "configure"
|
||||
#line 1274 "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:1288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1295,13 +1287,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1299 "configure"
|
||||
#line 1291 "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:1305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -1328,7 +1320,7 @@ echo "$ac_t""$CPP" 1>&6
|
|||
# Extract the first word of "perl", so it can be a program name with args.
|
||||
set dummy perl; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1332: checking for $ac_word" >&5
|
||||
echo "configure:1324: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1374,7 +1366,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:1378: checking for a BSD compatible install" >&5
|
||||
echo "configure:1370: 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
|
||||
|
|
@ -1437,7 +1429,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1441: checking whether ln -s works" >&5
|
||||
echo "configure:1433: 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
|
||||
|
|
@ -1462,7 +1454,7 @@ TAR=
|
|||
# Extract the first word of "gtar", so it can be a program name with args.
|
||||
set dummy gtar; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1466: checking for $ac_word" >&5
|
||||
echo "configure:1458: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1507,21 +1499,21 @@ fi
|
|||
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
GNUSTEP_HDIR=$prefix/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
GNUSTEP_LDIR=$prefix/Libraries
|
||||
else
|
||||
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_ROOT/Libraries/$obj_dir
|
||||
GNUSTEP_LDIR=$prefix/Libraries/$obj_dir
|
||||
fi
|
||||
|
||||
# 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
|
||||
echo $ac_n "checking for alternate objc library""... $ac_c" 1>&6
|
||||
echo "configure:1525: checking for alternate objc library" >&5
|
||||
echo "configure:1517: checking for alternate objc library" >&5
|
||||
if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1545,7 +1537,7 @@ echo "$ac_t""$gs_cv_objc_libdir" 1>&6
|
|||
#if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR"
|
||||
|
||||
# And the following to execute them
|
||||
|
|
@ -1562,12 +1554,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:1566: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1558: 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 1571 "configure"
|
||||
#line 1563 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1575,7 +1567,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1600,7 +1592,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:1604: checking for opendir in -ldir" >&5
|
||||
echo "configure:1596: 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
|
||||
|
|
@ -1608,7 +1600,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1612 "configure"
|
||||
#line 1604 "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
|
||||
|
|
@ -1619,7 +1611,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1641,7 +1633,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1645: checking for opendir in -lx" >&5
|
||||
echo "configure:1637: 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
|
||||
|
|
@ -1649,7 +1641,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1653 "configure"
|
||||
#line 1645 "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
|
||||
|
|
@ -1660,7 +1652,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -1686,17 +1678,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:1690: checking for $ac_hdr" >&5
|
||||
echo "configure:1682: 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 1695 "configure"
|
||||
#line 1687 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1727,7 +1719,7 @@ done
|
|||
# Check if libobjc was compiled with thread support.
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||
echo "configure:1731: checking whether objc has thread support" >&5
|
||||
echo "configure:1723: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -1744,11 +1736,11 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1748 "configure"
|
||||
#line 1740 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1766,11 +1758,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
|||
objc_threaded="-pthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1770 "configure"
|
||||
#line 1762 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
|
|
@ -1788,11 +1780,11 @@ fi
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1792 "configure"
|
||||
#line 1784 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1811,11 +1803,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1815 "configure"
|
||||
#line 1807 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -1834,11 +1826,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1838 "configure"
|
||||
#line 1830 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
@ -2016,7 +2008,6 @@ s%@oldincludedir@%$oldincludedir%g
|
|||
s%@infodir@%$infodir%g
|
||||
s%@mandir@%$mandir%g
|
||||
s%@GNUSTEP_ROOT@%$GNUSTEP_ROOT%g
|
||||
s%@GNUSTEP_PREFIX@%$GNUSTEP_PREFIX%g
|
||||
s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g
|
||||
s%@host@%$host%g
|
||||
s%@host_alias@%$host_alias%g
|
||||
|
|
|
|||
16
configure.in
16
configure.in
|
|
@ -37,7 +37,6 @@ if test "x$prefix" = "xNONE"; then
|
|||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
GNUSTEP_PREFIX='$(prefix)'
|
||||
AC_ARG_WITH(system-root,
|
||||
[ --without-system-root Dont use separate system root directory],
|
||||
ac_cv_system_root=$withval,
|
||||
|
|
@ -48,16 +47,9 @@ if test $ac_cv_system_root = yes; then
|
|||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
else
|
||||
prefix=$prefix/System
|
||||
GNUSTEP_PREFIX='$(prefix)/..'
|
||||
fi
|
||||
else
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX="$(prefix)/.."
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(GNUSTEP_ROOT)
|
||||
AC_SUBST(GNUSTEP_PREFIX)
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -215,14 +207,14 @@ fi
|
|||
AC_SUBST(FORCE_CPPFLAGS)
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
|
||||
GNUSTEP_HDIR=$prefix/Headers
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
|
||||
GNUSTEP_LDIR=$prefix/Libraries
|
||||
else
|
||||
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_ROOT/Libraries/$obj_dir
|
||||
GNUSTEP_LDIR=$prefix/Libraries/$obj_dir
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -249,7 +241,7 @@ AC_MSG_RESULT($gs_cv_objc_libdir)
|
|||
#if test "$gs_cv_objc_libdir" != "NONE"; then
|
||||
|
||||
# The following are needed to compile the test programs
|
||||
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_ROOT/Headers"
|
||||
CPPFLAGS="$CPPFLAGS -I$prefix/Headers"
|
||||
LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR"
|
||||
|
||||
# And the following to execute them
|
||||
|
|
|
|||
Loading…
Reference in a new issue