mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Correct setting of prefix
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8943 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
eda340c6b6
commit
977b1ee5e5
6 changed files with 106 additions and 100 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2001-01-30 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Redo setting prefix again! prefix is now the
|
||||
base directory (typically /usr/GNUstep) and GNUSTEP_SYSTEM_ROOT
|
||||
is set to $prefix/System (typically).
|
||||
* GNUmakefile.in: Update for new prefix
|
||||
* GNUstep.csh.in: Likewise.
|
||||
* GNUstep.sh.in: Likewise.
|
||||
|
||||
Mon Jan 29 23:38:25 2001 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* debian: New directory.
|
||||
|
|
|
|||
|
|
@ -30,8 +30,7 @@ include config.make
|
|||
include Version
|
||||
|
||||
prefix = @prefix@
|
||||
GNUSTEP_INSTALLATION_DIR=$(prefix)
|
||||
GNUSTEP_ROOT = @GNUSTEP_ROOT@
|
||||
GNUSTEP_SYSTEM_ROOT = @GNUSTEP_SYSTEM_ROOT@
|
||||
srcdir = @srcdir@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
|
|
@ -58,9 +57,9 @@ else
|
|||
GNUSTEP_TARGET_LDIR = .
|
||||
endif
|
||||
|
||||
makedir = $(prefix)/Makefiles
|
||||
tooldir = $(prefix)/Tools
|
||||
librarydir = $(prefix)/Libraries
|
||||
makedir = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
|
||||
librarydir = $(GNUSTEP_SYSTEM_ROOT)/Libraries
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -85,30 +84,30 @@ which_lib$(EXEEXT): which_lib.c
|
|||
$(CC) @CFLAGS@ -Wall -o $@ $^
|
||||
|
||||
install: all
|
||||
$(srcdir)/mkinstalldirs $(GNUSTEP_ROOT) $(prefix) $(makedir) \
|
||||
$(srcdir)/mkinstalldirs $(prefix) $(GNUSTEP_SYSTEM_ROOT) $(makedir) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_CPU) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(makedir)/Additional \
|
||||
$(tooldir) \
|
||||
$(prefix)/share \
|
||||
$(prefix)/Apps \
|
||||
$(prefix)/Libraries/$(GNUSTEP_TARGET_DIR) \
|
||||
$(prefix)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(prefix)/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(prefix)/Tools/$(GNUSTEP_TARGET_DIR) \
|
||||
$(prefix)/Tools/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(prefix)/Library \
|
||||
$(prefix)/Library/Colors \
|
||||
$(prefix)/Library/PostScript \
|
||||
$(prefix)/Library/Services \
|
||||
$(prefix)/Documentation/Developer \
|
||||
$(prefix)/Documentation/User \
|
||||
$(prefix)/Documentation/info \
|
||||
$(prefix)/Documentation/man \
|
||||
$(GNUSTEP_ROOT)/Local \
|
||||
$(GNUSTEP_ROOT)/Local/Users \
|
||||
$(GNUSTEP_ROOT)/Local/Users/Administrator \
|
||||
$(GNUSTEP_ROOT)/Network
|
||||
$(GNUSTEP_SYSTEM_ROOT)/share \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Apps \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Tools/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Tools/$(GNUSTEP_TARGET_LDIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Colors \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/PostScript \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Services \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Documentation/Developer \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Documentation/User \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Documentation/info \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Documentation/man \
|
||||
$(prefix)/Local \
|
||||
$(prefix)/Local/Users \
|
||||
$(prefix)/Local/Users/Administrator \
|
||||
$(prefix)/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 \
|
||||
|
|
@ -124,7 +123,7 @@ install: all
|
|||
for f in $(MAKE_FILES); do \
|
||||
$(INSTALL_DATA) $$f $(makedir); \
|
||||
done
|
||||
$(INSTALL_DATA) config.site $(prefix)/share
|
||||
$(INSTALL_DATA) config.site $(GNUSTEP_SYSTEM_ROOT)/share
|
||||
$(INSTALL_DATA) config.make $(makedir)/$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
uninstall:
|
||||
|
|
@ -143,7 +142,7 @@ uninstall:
|
|||
for f in $(MAKE_FILES); do \
|
||||
rm -f $(makedir)/$$f; \
|
||||
done
|
||||
rm -f $(prefix)/share/config.site
|
||||
rm -f $(GNUSTEP_SYSTEM_ROOT)/share/config.site
|
||||
rm -f $(makedir)/$(GNUSTEP_TARGET_DIR)/config.make
|
||||
|
||||
clean:
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
#
|
||||
# Set the GNUstep system root and local root
|
||||
#
|
||||
setenv GNUSTEP_ROOT @GNUSTEP_ROOT@
|
||||
setenv GNUSTEP_SYSTEM_ROOT @prefix@
|
||||
setenv GNUSTEP_ROOT @prefix@
|
||||
setenv GNUSTEP_SYSTEM_ROOT @GNUSTEP_SYSTEM_ROOT@
|
||||
setenv GNUSTEP_FLATTENED @GNUSTEP_FLATTENED@
|
||||
if ( ! ${?LIBRARY_COMBO} ) then
|
||||
setenv LIBRARY_COMBO @ac_cv_library_combo@
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@
|
|||
#
|
||||
# Set the GNUstep system root and local root
|
||||
#
|
||||
GNUSTEP_ROOT=@GNUSTEP_ROOT@
|
||||
GNUSTEP_SYSTEM_ROOT=@prefix@
|
||||
GNUSTEP_ROOT=@prefix@
|
||||
GNUSTEP_SYSTEM_ROOT=@GNUSTEP_SYSTEM_ROOT@
|
||||
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
|
||||
if [ -z "$LIBRARY_COMBO" ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
|
|
|
|||
123
configure
vendored
123
configure
vendored
|
|
@ -12,8 +12,7 @@ ac_help=
|
|||
ac_default_prefix=/usr/local
|
||||
# Any additions from configure.in:
|
||||
ac_default_prefix=`if test "x$GNUSTEP_SYSTEM_ROOT" = "x"; then
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep ;
|
||||
echo $GNUSTEP_SYSTEM_ROOT ;
|
||||
echo /usr/GNUstep ;
|
||||
else
|
||||
echo $GNUSTEP_SYSTEM_ROOT ;
|
||||
fi`
|
||||
|
|
@ -572,7 +571,6 @@ fi
|
|||
if test "x$prefix" = "xNONE"; then
|
||||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
# Check whether --with-system-root or --without-system-root was given.
|
||||
if test "${with_system_root+set}" = set; then
|
||||
withval="$with_system_root"
|
||||
|
|
@ -584,10 +582,11 @@ fi
|
|||
|
||||
if test $ac_cv_system_root = yes; then
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
else
|
||||
prefix=$prefix/System
|
||||
prefix=`dirname $prefix`
|
||||
fi
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix/System
|
||||
else
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -666,7 +665,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:670: checking host system type" >&5
|
||||
echo "configure:669: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -687,7 +686,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:691: checking target system type" >&5
|
||||
echo "configure:690: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -705,7 +704,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:709: checking build system type" >&5
|
||||
echo "configure:708: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -807,7 +806,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:811: checking for $ac_word" >&5
|
||||
echo "configure:810: 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
|
||||
|
|
@ -837,7 +836,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:841: checking for $ac_word" >&5
|
||||
echo "configure:840: 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
|
||||
|
|
@ -867,7 +866,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:871: checking for $ac_word" >&5
|
||||
echo "configure:870: 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
|
||||
|
|
@ -897,7 +896,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:901: checking for $ac_word" >&5
|
||||
echo "configure:900: 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
|
||||
|
|
@ -928,7 +927,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:932: checking for $ac_word" >&5
|
||||
echo "configure:931: 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
|
||||
|
|
@ -957,7 +956,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:961: checking for $ac_word" >&5
|
||||
echo "configure:960: 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
|
||||
|
|
@ -986,7 +985,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:990: checking for $ac_word" >&5
|
||||
echo "configure:989: 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
|
||||
|
|
@ -1018,7 +1017,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:1022: checking for $ac_word" >&5
|
||||
echo "configure:1021: 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
|
||||
|
|
@ -1048,7 +1047,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:1052: checking for $ac_word" >&5
|
||||
echo "configure:1051: 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
|
||||
|
|
@ -1099,7 +1098,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:1103: checking for $ac_word" >&5
|
||||
echo "configure:1102: 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
|
||||
|
|
@ -1131,7 +1130,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1135: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1134: 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.
|
||||
|
|
@ -1142,12 +1141,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1146 "configure"
|
||||
#line 1145 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1150: \"$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
|
||||
|
|
@ -1173,12 +1172,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:1177: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1176: 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:1182: checking whether we are using GNU C" >&5
|
||||
echo "configure:1181: 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
|
||||
|
|
@ -1187,7 +1186,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
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
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1190: \"$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
|
||||
|
|
@ -1206,7 +1205,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:1210: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1209: 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
|
||||
|
|
@ -1238,7 +1237,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1242: checking how to run the C preprocessor" >&5
|
||||
echo "configure:1241: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -1253,13 +1252,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 1257 "configure"
|
||||
#line 1256 "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:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1262: \"$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
|
||||
:
|
||||
|
|
@ -1270,13 +1269,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1274 "configure"
|
||||
#line 1273 "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:1280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1279: \"$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
|
||||
:
|
||||
|
|
@ -1287,13 +1286,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1291 "configure"
|
||||
#line 1290 "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:1297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1296: \"$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
|
||||
:
|
||||
|
|
@ -1320,7 +1319,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:1324: checking for $ac_word" >&5
|
||||
echo "configure:1323: 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
|
||||
|
|
@ -1366,7 +1365,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:1370: checking for a BSD compatible install" >&5
|
||||
echo "configure:1369: 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
|
||||
|
|
@ -1429,7 +1428,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1433: checking whether ln -s works" >&5
|
||||
echo "configure:1432: 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
|
||||
|
|
@ -1454,7 +1453,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:1458: checking for $ac_word" >&5
|
||||
echo "configure:1457: 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
|
||||
|
|
@ -1513,7 +1512,7 @@ fi
|
|||
# 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:1517: checking for alternate objc library" >&5
|
||||
echo "configure:1516: 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
|
||||
|
|
@ -1554,12 +1553,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:1558: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1557: 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 1563 "configure"
|
||||
#line 1562 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1567,7 +1566,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1592,7 +1591,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:1596: checking for opendir in -ldir" >&5
|
||||
echo "configure:1595: 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
|
||||
|
|
@ -1600,7 +1599,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1604 "configure"
|
||||
#line 1603 "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
|
||||
|
|
@ -1611,7 +1610,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1614: \"$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
|
||||
|
|
@ -1633,7 +1632,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1637: checking for opendir in -lx" >&5
|
||||
echo "configure:1636: 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
|
||||
|
|
@ -1641,7 +1640,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1645 "configure"
|
||||
#line 1644 "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
|
||||
|
|
@ -1652,7 +1651,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1655: \"$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
|
||||
|
|
@ -1678,17 +1677,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:1682: checking for $ac_hdr" >&5
|
||||
echo "configure:1681: 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 1687 "configure"
|
||||
#line 1686 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1691: \"$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*
|
||||
|
|
@ -1719,7 +1718,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:1723: checking whether objc has thread support" >&5
|
||||
echo "configure:1722: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -1736,11 +1735,11 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1740 "configure"
|
||||
#line 1739 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1758,11 +1757,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 1762 "configure"
|
||||
#line 1761 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
|
|
@ -1780,11 +1779,11 @@ fi
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1784 "configure"
|
||||
#line 1783 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1803,11 +1802,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1807 "configure"
|
||||
#line 1806 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -1826,11 +1825,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1830 "configure"
|
||||
#line 1829 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
@ -2007,7 +2006,7 @@ s%@includedir@%$includedir%g
|
|||
s%@oldincludedir@%$oldincludedir%g
|
||||
s%@infodir@%$infodir%g
|
||||
s%@mandir@%$mandir%g
|
||||
s%@GNUSTEP_ROOT@%$GNUSTEP_ROOT%g
|
||||
s%@GNUSTEP_SYSTEM_ROOT@%$GNUSTEP_SYSTEM_ROOT%g
|
||||
s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g
|
||||
s%@host@%$host%g
|
||||
s%@host_alias@%$host_alias%g
|
||||
|
|
|
|||
13
configure.in
13
configure.in
|
|
@ -28,15 +28,13 @@ AC_CONFIG_HEADER(config.h)
|
|||
# defined, but if not then we have a global default.
|
||||
#--------------------------------------------------------------------
|
||||
AC_PREFIX_DEFAULT(`if test "x$GNUSTEP_SYSTEM_ROOT" = "x"; then
|
||||
GNUSTEP_SYSTEM_ROOT=/usr/GNUstep ;
|
||||
echo $GNUSTEP_SYSTEM_ROOT ;
|
||||
echo /usr/GNUstep ;
|
||||
else
|
||||
echo $GNUSTEP_SYSTEM_ROOT ;
|
||||
fi`)
|
||||
if test "x$prefix" = "xNONE"; then
|
||||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
AC_ARG_WITH(system-root,
|
||||
[ --without-system-root Dont use separate system root directory],
|
||||
ac_cv_system_root=$withval,
|
||||
|
|
@ -44,12 +42,13 @@ AC_ARG_WITH(system-root,
|
|||
|
||||
if test $ac_cv_system_root = yes; then
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
else
|
||||
prefix=$prefix/System
|
||||
prefix=`dirname $prefix`
|
||||
fi
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix/System
|
||||
else
|
||||
GNUSTEP_SYSTEM_ROOT=$prefix
|
||||
fi
|
||||
AC_SUBST(GNUSTEP_ROOT)
|
||||
AC_SUBST(GNUSTEP_SYSTEM_ROOT)
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue