mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Allow for separate system root
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@4987 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
5e7ccfcab1
commit
7f54784b4a
10 changed files with 249 additions and 151 deletions
14
ChangeLog
14
ChangeLog
|
|
@ -1,3 +1,17 @@
|
|||
1999-10-11 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Allow for separate System root directory and other changes
|
||||
suggested by Dennis Leeuw <adl@casema.net>.
|
||||
* configure.in: Add test for separate system root directory.
|
||||
* GNUmakefile.in (GNUSTEP_PREFIX): Absolute GNUstep root. Move
|
||||
man and info dirs to separate Documentation dir.
|
||||
* GNUstep.csh.in: (GNUSTEP_ROOT): Absolute root. Define Local dir
|
||||
interms of this. Add Network dir.
|
||||
* GNUstep.sh.in: Likewise.
|
||||
* common.make: Move documentation dirs. Add Network dir info.
|
||||
Look for gui Headers in gnustep/AppKit.
|
||||
* rules.make: Add Network dir info.
|
||||
|
||||
Tue Sep 28 19:05:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* brain.make: Define GS_WITH_GC and link with gc version of objc
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
|
||||
include config.make
|
||||
|
||||
GNUSTEP_PREFIX = @GNUSTEP_PREFIX@
|
||||
GNUSTEP_INSTALLATION_DIR = @prefix@
|
||||
srcdir = @srcdir@
|
||||
prefix = $(GNUSTEP_INSTALLATION_DIR)
|
||||
|
|
@ -60,7 +61,8 @@ which_lib$(EXEEXT): which_lib.c
|
|||
$(CC) @CFLAGS@ -Wall -o $@ $^
|
||||
|
||||
install: all
|
||||
$(srcdir)/mkinstalldirs $(prefix) $(makedir) \
|
||||
$(srcdir)/mkinstalldirs $(GNUSTEP_PREFIX) $(makedir) \
|
||||
$(prefix) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_CPU) \
|
||||
$(makedir)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(tooldir) \
|
||||
|
|
@ -71,10 +73,14 @@ install: all
|
|||
$(prefix)/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(prefix)/Tools/$(GNUSTEP_TARGET_DIR) \
|
||||
$(prefix)/Library \
|
||||
$(prefix)/Library/info \
|
||||
$(prefix)/Library/PostScript \
|
||||
$(prefix)/Library/Services \
|
||||
$(prefix)/Library/man
|
||||
$(prefix)/Documentation/info \
|
||||
$(prefix)/Documentation/man \
|
||||
$(GNUSTEP_PREFIX)/Local \
|
||||
$(GNUSTEP_PREFIX)/Local/Users \
|
||||
$(GNUSTEP_PREFIX)/Local/Users/Administrator \
|
||||
$(GNUSTEP_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 \
|
||||
|
|
|
|||
|
|
@ -24,12 +24,14 @@
|
|||
#
|
||||
# Set the GNUstep system root and local root
|
||||
#
|
||||
setenv GNUSTEP_ROOT @GNUSTEP_ROOT@
|
||||
setenv GNUSTEP_SYSTEM_ROOT @prefix@
|
||||
if ( ! ${?LIBRARY_COMBO} ) then
|
||||
setenv LIBRARY_COMBO @ac_cv_library_combo@
|
||||
endif
|
||||
|
||||
setenv GNUSTEP_LOCAL_ROOT @prefix@/Local
|
||||
setenv GNUSTEP_LOCAL_ROOT '${GNUSTEP_ROOT}/Local'
|
||||
setenv GNUSTEP_NETWORK_ROOT
|
||||
setenv GNUSTEP_USER_ROOT ~/GNUstep
|
||||
|
||||
if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
|
||||
|
|
@ -63,7 +65,7 @@ if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
|
|||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
if ( ! ${?GNUSTEP_PATHPREFIX_LIST} ) then
|
||||
setenv GNUSTEP_PATHPREFIX_LIST ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_SYSTEM_ROOT}
|
||||
setenv GNUSTEP_PATHPREFIX_LIST ${GNUSTEP_USER_ROOT}:${GNUSTEP_LOCAL_ROOT}:${GNUSTEP_SYSTEM_ROOT}:${GNUSTEP_NETWORK_ROOT}
|
||||
endif # ( "${GNUSTEP_PATHPREFIX_LIST}" == "" )
|
||||
|
||||
set tp = ""
|
||||
|
|
|
|||
|
|
@ -24,15 +24,17 @@
|
|||
#
|
||||
# Set the GNUstep system root and local root
|
||||
#
|
||||
GNUSTEP_ROOT=@GNUSTEP_ROOT@
|
||||
GNUSTEP_SYSTEM_ROOT=@prefix@
|
||||
if [ -z "$LIBRARY_COMBO" ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
fi
|
||||
export GNUSTEP_SYSTEM_ROOT LIBRARY_COMBO
|
||||
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT LIBRARY_COMBO
|
||||
|
||||
GNUSTEP_LOCAL_ROOT=@prefix@/Local
|
||||
GNUSTEP_LOCAL_ROOT=$GNUSTEP_ROOT/Local
|
||||
GNUSTEP_NETWORK_ROOT=$GNUSTEP_ROOT/Network
|
||||
GNUSTEP_USER_ROOT=~/GNUstep
|
||||
export GNUSTEP_LOCAL_ROOT GNUSTEP_USER_ROOT
|
||||
export GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_ROOT
|
||||
|
||||
if [ -z "$GNUSTEP_BUILD_ROOT" ]; then
|
||||
GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Makefiles
|
||||
|
|
@ -67,7 +69,7 @@ if [ -z "$GNUSTEP_BUILD_ROOT" ]; then
|
|||
# Add the GNUstep tools directories to the path
|
||||
#
|
||||
if [ -z "$GNUSTEP_PATHPREFIX_LIST" ]; then
|
||||
GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_SYSTEM_ROOT
|
||||
GNUSTEP_PATHPREFIX_LIST=$GNUSTEP_USER_ROOT:$GNUSTEP_LOCAL_ROOT:$GNUSTEP_SYSTEM_ROOT:$GNUSTEP_NETWORK_ROOT
|
||||
export GNUSTEP_PATHPREFIX_LIST
|
||||
fi # [ -z "$GNUSTEP_PATHPREFIX_LIST" ]
|
||||
|
||||
|
|
|
|||
27
common.make
27
common.make
|
|
@ -96,7 +96,7 @@ GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Libraries
|
|||
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_RESOURCES = $(GNUSTEP_LIBRARIES_ROOT)/Resources
|
||||
GNUSTEP_DOCUMENTATION = $(GNUSTEP_INSTALLATION_DIR)/Library
|
||||
GNUSTEP_DOCUMENTATION = $(GNUSTEP_INSTALLATION_DIR)/Documentation
|
||||
GNUSTEP_DOCUMENTATION_MAN = $(GNUSTEP_DOCUMENTATION)/man
|
||||
GNUSTEP_DOCUMENTATION_INFO = $(GNUSTEP_DOCUMENTATION)/info
|
||||
|
||||
|
|
@ -135,9 +135,23 @@ GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers
|
|||
GNUSTEP_USER_HEADERS_FLAG = -I$(GNUSTEP_USER_HEADERS)
|
||||
endif
|
||||
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
GNUSTEP_NETWORK_LIBRARIES_ROOT = $(GNUSTEP_NETWORK_ROOT)/Libraries
|
||||
GNUSTEP_NETWORK_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_NETWORK_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_TARGET_LIBRARIES)
|
||||
GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_NETWORK_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_LIBRARIES)
|
||||
GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers
|
||||
GNUSTEP_NETWORK_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_HEADERS)
|
||||
endif
|
||||
#
|
||||
# Target specific header include directories
|
||||
#
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAG += \
|
||||
-I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
|
|
@ -172,6 +186,9 @@ GNUSTEP_FND_DIR = sun
|
|||
FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
|
||||
endif
|
||||
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
endif
|
||||
|
|
@ -183,14 +200,18 @@ GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)
|
|||
ifeq ($(FOUNDATION_LIB), fd)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
|
||||
-I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)
|
||||
endif
|
||||
|
||||
#
|
||||
# Determine AppKit header subdirectory based upon library combo
|
||||
#
|
||||
ifeq ($(GUI_LIB),gnu)
|
||||
GNUSTEP_GUI_DIR = gnustep/gui
|
||||
GNUSTEP_GUI_DIR = gnustep
|
||||
ifneq ($(GNUSTEP_NETWORK_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -84,11 +84,11 @@ fi
|
|||
|
||||
# Change the info directory default
|
||||
if test "$infodir" = "\${prefix}/info" ; then
|
||||
infodir="\${prefix}/Library/info"
|
||||
infodir="\${prefix}/Documentation/info"
|
||||
fi
|
||||
|
||||
# Change the man directory default
|
||||
if test "$mandir" = "\${prefix}/man" ; then
|
||||
mandir="\${prefix}/Library/man"
|
||||
mandir="\${prefix}/Documentation/man"
|
||||
fi
|
||||
|
||||
|
|
|
|||
280
configure
vendored
280
configure
vendored
|
|
@ -17,20 +17,22 @@ echo $GNUSTEP_SYSTEM_ROOT ;
|
|||
else
|
||||
echo $GNUSTEP_SYSTEM_ROOT ;
|
||||
fi`
|
||||
ac_help="$ac_help
|
||||
--enable-system-root Use separate system root directory"
|
||||
ac_help="$ac_help
|
||||
--with-x use the X Window System"
|
||||
ac_help="$ac_help
|
||||
--with-dps-library=DIR DPS library file are in DIR"
|
||||
--with-dps-library=DIR DPS library file are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-dps-include=DIR DPS include files are in DIR"
|
||||
--with-dps-include=DIR DPS include files are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-jpeg-library=DIR JPEG library file are in DIR"
|
||||
--with-jpeg-library=DIR JPEG library file are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-jpeg-include=DIR JPEG include files are in DIR"
|
||||
--with-jpeg-include=DIR JPEG include files are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-tiff-library=DIR TIFF library file are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-tiff-include=DIR TIFF include files are in DIR"
|
||||
--with-tiff-include=DIR TIFF include files are in DIR"
|
||||
ac_help="$ac_help
|
||||
|
||||
--with-library-combo
|
||||
|
|
@ -582,6 +584,30 @@ fi
|
|||
if test "x$prefix" = "xNONE"; then
|
||||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
GNUSTEP_PREFIX='$(prefix)'
|
||||
# Check whether --enable-system-root or --disable-system-root was given.
|
||||
if test "${enable_system_root+set}" = set; then
|
||||
enableval="$enable_system_root"
|
||||
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX='$(prefix)/..'
|
||||
else
|
||||
prefix=$prefix/System
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX="$(prefix)/.."
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the host, build, and target systems
|
||||
|
|
@ -634,7 +660,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:638: checking host system type" >&5
|
||||
echo "configure:664: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -655,7 +681,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:659: checking target system type" >&5
|
||||
echo "configure:685: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -673,7 +699,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:677: checking build system type" >&5
|
||||
echo "configure:703: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -711,7 +737,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:715: checking for $ac_word" >&5
|
||||
echo "configure:741: 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
|
||||
|
|
@ -741,7 +767,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:745: checking for $ac_word" >&5
|
||||
echo "configure:771: 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
|
||||
|
|
@ -771,7 +797,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:775: checking for $ac_word" >&5
|
||||
echo "configure:801: 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
|
||||
|
|
@ -801,7 +827,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:805: checking for $ac_word" >&5
|
||||
echo "configure:831: 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
|
||||
|
|
@ -832,7 +858,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:836: checking for $ac_word" >&5
|
||||
echo "configure:862: 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
|
||||
|
|
@ -861,7 +887,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:865: checking for $ac_word" >&5
|
||||
echo "configure:891: 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
|
||||
|
|
@ -890,7 +916,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:894: checking for $ac_word" >&5
|
||||
echo "configure:920: 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
|
||||
|
|
@ -922,7 +948,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:926: checking for $ac_word" >&5
|
||||
echo "configure:952: 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
|
||||
|
|
@ -952,7 +978,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:956: checking for $ac_word" >&5
|
||||
echo "configure:982: 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
|
||||
|
|
@ -1003,7 +1029,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:1007: checking for $ac_word" >&5
|
||||
echo "configure:1033: 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
|
||||
|
|
@ -1035,7 +1061,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:1065: 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.
|
||||
|
|
@ -1046,12 +1072,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 1050 "configure"
|
||||
#line 1076 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:1055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1081: \"$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
|
||||
|
|
@ -1077,12 +1103,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:1081: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:1107: 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:1086: checking whether we are using GNU C" >&5
|
||||
echo "configure:1112: 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
|
||||
|
|
@ -1091,7 +1117,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1095: \"$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:1121: \"$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
|
||||
|
|
@ -1110,7 +1136,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:1114: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:1140: 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
|
||||
|
|
@ -1142,7 +1168,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:1146: checking how to run the C preprocessor" >&5
|
||||
echo "configure:1172: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -1157,13 +1183,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 1161 "configure"
|
||||
#line 1187 "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:1167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1193: \"$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
|
||||
:
|
||||
|
|
@ -1174,13 +1200,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1178 "configure"
|
||||
#line 1204 "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:1184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1210: \"$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
|
||||
:
|
||||
|
|
@ -1191,13 +1217,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1195 "configure"
|
||||
#line 1221 "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:1201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1227: \"$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
|
||||
:
|
||||
|
|
@ -1224,7 +1250,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:1228: checking for $ac_word" >&5
|
||||
echo "configure:1254: 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
|
||||
|
|
@ -1270,7 +1296,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:1274: checking for a BSD compatible install" >&5
|
||||
echo "configure:1300: 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
|
||||
|
|
@ -1333,7 +1359,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1337: checking whether ln -s works" >&5
|
||||
echo "configure:1363: 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
|
||||
|
|
@ -1362,7 +1388,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:1366: checking for X" >&5
|
||||
echo "configure:1392: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
|
|
@ -1424,12 +1450,12 @@ if test "$ac_x_includes" = NO; then
|
|||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1428 "configure"
|
||||
#line 1454 "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:1433: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1459: \"$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*
|
||||
|
|
@ -1498,14 +1524,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 1502 "configure"
|
||||
#line 1528 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
|
|
@ -1611,17 +1637,17 @@ else
|
|||
case "`(uname -sr) 2>/dev/null`" in
|
||||
"SunOS 5"*)
|
||||
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
|
||||
echo "configure:1615: checking whether -R must be followed by a space" >&5
|
||||
echo "configure:1641: checking whether -R must be followed by a space" >&5
|
||||
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1618 "configure"
|
||||
#line 1644 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_nospace=yes
|
||||
else
|
||||
|
|
@ -1637,14 +1663,14 @@ rm -f conftest*
|
|||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1641 "configure"
|
||||
#line 1667 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_space=yes
|
||||
else
|
||||
|
|
@ -1676,7 +1702,7 @@ rm -f conftest*
|
|||
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
|
||||
echo "configure:1680: checking for dnet_ntoa in -ldnet" >&5
|
||||
echo "configure:1706: checking for dnet_ntoa in -ldnet" >&5
|
||||
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1684,7 +1710,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1688 "configure"
|
||||
#line 1714 "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
|
||||
|
|
@ -1695,7 +1721,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1725: \"$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
|
||||
|
|
@ -1717,7 +1743,7 @@ fi
|
|||
|
||||
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
|
||||
echo "configure:1721: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
echo "configure:1747: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1725,7 +1751,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1729 "configure"
|
||||
#line 1755 "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
|
||||
|
|
@ -1736,7 +1762,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1766: \"$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
|
||||
|
|
@ -1765,12 +1791,12 @@ fi
|
|||
# The nsl library prevents programs from opening the X display
|
||||
# on Irix 5.2, according to dickey@clark.net.
|
||||
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
|
||||
echo "configure:1769: checking for gethostbyname" >&5
|
||||
echo "configure:1795: checking for gethostbyname" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1774 "configure"
|
||||
#line 1800 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char gethostbyname(); below. */
|
||||
|
|
@ -1793,7 +1819,7 @@ gethostbyname();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_gethostbyname=yes"
|
||||
else
|
||||
|
|
@ -1814,7 +1840,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:1818: checking for gethostbyname in -lnsl" >&5
|
||||
echo "configure:1844: checking for gethostbyname in -lnsl" >&5
|
||||
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1822,7 +1848,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1826 "configure"
|
||||
#line 1852 "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
|
||||
|
|
@ -1833,7 +1859,7 @@ int main() {
|
|||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1863: \"$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
|
||||
|
|
@ -1863,12 +1889,12 @@ fi
|
|||
# -lsocket must be given before -lnsl if both are needed.
|
||||
# We assume that if connect needs -lnsl, so does gethostbyname.
|
||||
echo $ac_n "checking for connect""... $ac_c" 1>&6
|
||||
echo "configure:1867: checking for connect" >&5
|
||||
echo "configure:1893: checking for connect" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1872 "configure"
|
||||
#line 1898 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char connect(); below. */
|
||||
|
|
@ -1891,7 +1917,7 @@ connect();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_connect=yes"
|
||||
else
|
||||
|
|
@ -1912,7 +1938,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_connect = no; then
|
||||
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:1916: checking for connect in -lsocket" >&5
|
||||
echo "configure:1942: checking for connect in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -1920,7 +1946,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1924 "configure"
|
||||
#line 1950 "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
|
||||
|
|
@ -1931,7 +1957,7 @@ int main() {
|
|||
connect()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1961: \"$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
|
||||
|
|
@ -1955,12 +1981,12 @@ fi
|
|||
|
||||
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
|
||||
echo $ac_n "checking for remove""... $ac_c" 1>&6
|
||||
echo "configure:1959: checking for remove" >&5
|
||||
echo "configure:1985: checking for remove" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1964 "configure"
|
||||
#line 1990 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char remove(); below. */
|
||||
|
|
@ -1983,7 +2009,7 @@ remove();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_remove=yes"
|
||||
else
|
||||
|
|
@ -2004,7 +2030,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_remove = no; then
|
||||
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
||||
echo "configure:2008: checking for remove in -lposix" >&5
|
||||
echo "configure:2034: checking for remove in -lposix" >&5
|
||||
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2012,7 +2038,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lposix $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2016 "configure"
|
||||
#line 2042 "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
|
||||
|
|
@ -2023,7 +2049,7 @@ int main() {
|
|||
remove()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2053: \"$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
|
||||
|
|
@ -2047,12 +2073,12 @@ fi
|
|||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
||||
echo "configure:2051: checking for shmat" >&5
|
||||
echo "configure:2077: checking for shmat" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2056 "configure"
|
||||
#line 2082 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shmat(); below. */
|
||||
|
|
@ -2075,7 +2101,7 @@ shmat();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_shmat=yes"
|
||||
else
|
||||
|
|
@ -2096,7 +2122,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
||||
echo "configure:2100: checking for shmat in -lipc" >&5
|
||||
echo "configure:2126: checking for shmat in -lipc" >&5
|
||||
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2104,7 +2130,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lipc $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2108 "configure"
|
||||
#line 2134 "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
|
||||
|
|
@ -2115,7 +2141,7 @@ int main() {
|
|||
shmat()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2145: \"$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
|
||||
|
|
@ -2148,7 +2174,7 @@ fi
|
|||
# libraries we check for below, so use a different variable.
|
||||
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
||||
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
|
||||
echo "configure:2152: checking for IceConnectionNumber in -lICE" >&5
|
||||
echo "configure:2178: checking for IceConnectionNumber in -lICE" >&5
|
||||
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2156,7 +2182,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2160 "configure"
|
||||
#line 2186 "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
|
||||
|
|
@ -2167,7 +2193,7 @@ int main() {
|
|||
IceConnectionNumber()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2197: \"$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
|
||||
|
|
@ -2239,17 +2265,17 @@ for ac_hdr in DPS/dpsclient.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2243: checking for $ac_hdr" >&5
|
||||
echo "configure:2269: 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 2248 "configure"
|
||||
#line 2274 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2279: \"$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*
|
||||
|
|
@ -2280,17 +2306,17 @@ for ac_hdr in DPS/dpsNXargs.h
|
|||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:2284: checking for $ac_hdr" >&5
|
||||
echo "configure:2310: 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 2289 "configure"
|
||||
#line 2315 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2320: \"$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*
|
||||
|
|
@ -2331,12 +2357,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:2335: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:2361: 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 2340 "configure"
|
||||
#line 2366 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -2344,7 +2370,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -2369,7 +2395,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:2373: checking for opendir in -ldir" >&5
|
||||
echo "configure:2399: 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
|
||||
|
|
@ -2377,7 +2403,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2381 "configure"
|
||||
#line 2407 "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
|
||||
|
|
@ -2388,7 +2414,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2418: \"$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
|
||||
|
|
@ -2410,7 +2436,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:2414: checking for opendir in -lx" >&5
|
||||
echo "configure:2440: 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
|
||||
|
|
@ -2418,7 +2444,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2422 "configure"
|
||||
#line 2448 "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
|
||||
|
|
@ -2429,7 +2455,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2459: \"$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
|
||||
|
|
@ -2455,17 +2481,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:2459: checking for $ac_hdr" >&5
|
||||
echo "configure:2485: 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 2464 "configure"
|
||||
#line 2490 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2495: \"$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*
|
||||
|
|
@ -2519,7 +2545,7 @@ if test "x$JPEG_LIB" = x; then
|
|||
CPPFLAGS="-L${with_jpeg_library} -I${with_jpeg_include} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:2523: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
echo "configure:2549: checking for jpeg_destroy_decompress in -ljpeg" >&5
|
||||
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2527,7 +2553,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2531 "configure"
|
||||
#line 2557 "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
|
||||
|
|
@ -2538,7 +2564,7 @@ int main() {
|
|||
jpeg_destroy_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2568: \"$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
|
||||
|
|
@ -2561,9 +2587,9 @@ fi
|
|||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
|
||||
echo "configure:2565: checking for jpeglib.h" >&5
|
||||
echo "configure:2591: checking for jpeglib.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2567 "configure"
|
||||
#line 2593 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
|
|
@ -2572,7 +2598,7 @@ echo "configure:2565: checking for jpeglib.h" >&5
|
|||
#include <jpeglib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2602: \"$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*
|
||||
|
|
@ -2627,7 +2653,7 @@ if test "x$TIFF_LIB" = x; then
|
|||
tiff_check_lib_save_libs=${LIBS}
|
||||
CPPFLAGS="-L${with_tiff_library} ${JPEG_LIB} -I${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
echo $ac_n "checking for main in -lz""... $ac_c" 1>&6
|
||||
echo "configure:2631: checking for main in -lz" >&5
|
||||
echo "configure:2657: checking for main in -lz" >&5
|
||||
ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2635,14 +2661,14 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lz $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2639 "configure"
|
||||
#line 2665 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
main()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2672: \"$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
|
||||
|
|
@ -2665,17 +2691,17 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for -ltiff without -ljpeg nor -lz""... $ac_c" 1>&6
|
||||
echo "configure:2669: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
echo "configure:2695: checking for -ltiff without -ljpeg nor -lz" >&5
|
||||
LIBS="-ltiff -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2672 "configure"
|
||||
#line 2698 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
jpeg_notneeded=yes
|
||||
else
|
||||
|
|
@ -2694,17 +2720,17 @@ fi
|
|||
|
||||
if test $HAVE_LIBZ = 1; then
|
||||
echo $ac_n "checking for -ltiff without -lz""... $ac_c" 1>&6
|
||||
echo "configure:2698: checking for -ltiff without -lz" >&5
|
||||
echo "configure:2724: checking for -ltiff without -lz" >&5
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2701 "configure"
|
||||
#line 2727 "configure"
|
||||
#include "confdefs.h"
|
||||
char TIFFReadScanline();
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
libz_notneeded=yes
|
||||
else
|
||||
|
|
@ -2722,7 +2748,7 @@ rm -f conftest*
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:2726: checking for TIFFReadScanline in -ltiff" >&5
|
||||
echo "configure:2752: checking for TIFFReadScanline in -ltiff" >&5
|
||||
ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2730,7 +2756,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff $JPEG -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2734 "configure"
|
||||
#line 2760 "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
|
||||
|
|
@ -2741,7 +2767,7 @@ int main() {
|
|||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2771: \"$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
|
||||
|
|
@ -2774,17 +2800,17 @@ fi
|
|||
if test "$tiff_ok" = yes; then
|
||||
ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
|
||||
echo "configure:2778: checking for tiffio.h" >&5
|
||||
echo "configure:2804: checking for tiffio.h" >&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 2783 "configure"
|
||||
#line 2809 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:2788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:2814: \"$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*
|
||||
|
|
@ -2856,7 +2882,7 @@ fi
|
|||
# Check if libobjc was compiled with thread support.
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||
echo "configure:2860: checking whether objc has thread support" >&5
|
||||
echo "configure:2886: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -2871,11 +2897,11 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2875 "configure"
|
||||
#line 2901 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -2893,11 +2919,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2897 "configure"
|
||||
#line 2923 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -2915,11 +2941,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2919 "configure"
|
||||
#line 2945 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -2938,11 +2964,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2942 "configure"
|
||||
#line 2968 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
@ -3112,6 +3138,8 @@ s%@includedir@%$includedir%g
|
|||
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%@host@%$host%g
|
||||
s%@host_alias@%$host_alias%g
|
||||
s%@host_cpu@%$host_cpu%g
|
||||
|
|
|
|||
30
configure.in
30
configure.in
|
|
@ -36,6 +36,26 @@ fi`)
|
|||
if test "x$prefix" = "xNONE"; then
|
||||
prefix=$ac_default_prefix ;
|
||||
fi
|
||||
GNUSTEP_ROOT=$prefix
|
||||
GNUSTEP_PREFIX='$(prefix)'
|
||||
AC_ARG_ENABLE(system-root,
|
||||
[ --enable-system-root Use separate system root directory],
|
||||
[
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX='$(prefix)/..'
|
||||
else
|
||||
prefix=$prefix/System
|
||||
fi
|
||||
],
|
||||
[
|
||||
if test `basename $prefix` = System; then
|
||||
GNUSTEP_ROOT=`dirname $prefix`
|
||||
GNUSTEP_PREFIX="$(prefix)/.."
|
||||
fi
|
||||
])
|
||||
AC_SUBST(GNUSTEP_ROOT)
|
||||
AC_SUBST(GNUSTEP_PREFIX)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the host, build, and target systems
|
||||
|
|
@ -106,10 +126,10 @@ fi
|
|||
# Find for DPS
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(dps_library,
|
||||
[ --with-dps-library=DIR DPS library file are in DIR], ,
|
||||
[ --with-dps-library=DIR DPS library file are in DIR], ,
|
||||
with_dps_library=)
|
||||
AC_ARG_WITH(dps_include,
|
||||
[ --with-dps-include=DIR DPS include files are in DIR], ,
|
||||
[ --with-dps-include=DIR DPS include files are in DIR], ,
|
||||
with_dps_include=)
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
|
|
@ -146,10 +166,10 @@ AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
|||
# Find for JPEG
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(jpeg_library,
|
||||
[ --with-jpeg-library=DIR JPEG library file are in DIR], ,
|
||||
[ --with-jpeg-library=DIR JPEG library file are in DIR], ,
|
||||
with_jpeg_library=/usr/local/lib)
|
||||
AC_ARG_WITH(jpeg_include,
|
||||
[ --with-jpeg-include=DIR JPEG include files are in DIR], ,
|
||||
[ --with-jpeg-include=DIR JPEG include files are in DIR], ,
|
||||
with_jpeg_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_JPEGLIB,
|
||||
|
|
@ -193,7 +213,7 @@ AC_ARG_WITH(tiff_library,
|
|||
[ --with-tiff-library=DIR TIFF library file are in DIR], ,
|
||||
with_tiff_library=/usr/local/lib)
|
||||
AC_ARG_WITH(tiff_include,
|
||||
[ --with-tiff-include=DIR TIFF include files are in DIR], ,
|
||||
[ --with-tiff-include=DIR TIFF include files are in DIR], ,
|
||||
with_tiff_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIFFLIB,
|
||||
|
|
|
|||
|
|
@ -39,9 +39,9 @@ switch ( "${host_os}" )
|
|||
|
||||
case *nextstep4* :
|
||||
if ( $?DYLD_LIBRARY_PATH == 0 ) then
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
|
@ -56,9 +56,9 @@ switch ( "${host_os}" )
|
|||
|
||||
case * :
|
||||
if ( $?LD_LIBRARY_PATH == 0 ) then
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
else
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
|
||||
endif
|
||||
if ( $?additional_lib_paths == 1) then
|
||||
foreach dir (${additional_lib_paths})
|
||||
|
|
@ -73,3 +73,4 @@ switch ( "${host_os}" )
|
|||
|
||||
endsw
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -118,14 +118,16 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
|||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) $(GNUSTEP_NETWORK_HEADERS_FLAG) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
|
||||
|
|
@ -133,12 +135,14 @@ ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
|||
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) $(AUXILIARY_LIB_DIRS) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) $(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_NETWORK_LIBRARIES_FLAG) $(GNUSTEP_NETWORK_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR)
|
||||
|
||||
LIB_DIRS_NO_SYSTEM = $(ADDITIONAL_LIB_DIRS) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) $(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_NETWORK_LIBRARIES_FLAG) $(GNUSTEP_NETWORK_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
|
||||
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in a new issue