mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Merged in 'dawn' CVS branch
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@3827 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
a000f6e756
commit
296e2a83ae
12 changed files with 760 additions and 299 deletions
70
ChangeLog
70
ChangeLog
|
|
@ -1,7 +1,77 @@
|
|||
Tue Mar 2 08:04:00 1999 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* Merge in 'dawn' CVS branch.
|
||||
|
||||
1999-03-01 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: New search for DPS libraries.
|
||||
|
||||
1999-02-27 Matthias Klose <doko@cs.tu-berlin.de>
|
||||
|
||||
* make/target.make: Link shared libs against other libs (Linux only,
|
||||
should be possible for all ELF targets).
|
||||
|
||||
1999-02-28 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GNUmakefile.in: Use CFLAGS from configure rather than setting
|
||||
our own.
|
||||
* config.make.in (OPTFLAG): Use CFLAGS from configure.
|
||||
* common.make (OPTFLAG): Remove -O if debugging
|
||||
|
||||
* debugapp.in: Remove basename so debugapp can be used to run
|
||||
programs in other directories.
|
||||
(patches submitted by Christopher Seawood <cls@seawood.org>).
|
||||
|
||||
Thu Feb 25 20:25:04 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
||||
|
||||
* service.make ($(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist:):
|
||||
Added contents of SYSTEM_LIB_DIR to LD_LIBRARY_PATH.
|
||||
|
||||
* configure.in (AC_ARG_WITH(jpeg_library)): Fix a typo. (DIS->DIR).
|
||||
|
||||
1999-02-25 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* target.make (IRIX/SHARED_LIB_LINK_CMD): Fix typo.
|
||||
|
||||
Thu Feb 25 03:01:48 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
||||
|
||||
* configure.in: Added macros to check existence of jpeg and tiff.
|
||||
Stolen from gimp-1.0.0/configure.in.
|
||||
|
||||
* config.make.in (TIFF_INCLUDE): New variable definitions.
|
||||
(TIFF_LIB): Likewise.
|
||||
(JPEG_INCLUDE): Likewise.
|
||||
(JPEG_LIB): Likewise.
|
||||
|
||||
* brain.make (SYSTEM_INCLUDES): Added $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
(SYSTEM_LIB_DIR): Added $(TIFF_LIB) $(JPEG_LIB).
|
||||
|
||||
1999-02-24 Matthias Klose <doko@cs.tu-berlin.de>
|
||||
|
||||
* Makefiles/rules.make (%.build): evaluate LIBRARIES_DEPEND_UPON
|
||||
in this target, not when the file is read, else library names in
|
||||
foo_LIBRARIES_DEPEND_UPON macros are not transformed.
|
||||
|
||||
1999-02-22 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.in: Substitute version info.
|
||||
* config.make.in: Include version info.
|
||||
* brain.make: Define GNUSTEP if using GNUstep libraries.
|
||||
* common.make (AUXILARY_CPPFLAGS): Include GNUSTEP and Version defines.
|
||||
|
||||
1999-02-22 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* opentool: New file.
|
||||
|
||||
Sun Feb 21 15:01:48 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
||||
|
||||
* target.make (Solaris::AFTER_INSTALL_SHARED_LIB_COMMAND):
|
||||
Removed two duplicated lines.
|
||||
|
||||
Sun Feb 21 13:49:55 1999 Masatake Yamato <masata-y@is.aist-nara.ac.jp>
|
||||
|
||||
* rules.make (%.build): Check the length of string, $($*_SUBPROJECTS).
|
||||
|
||||
1999-02-19 Scott Christley <scottc@golden.net-community.com>
|
||||
|
||||
* MediaBook.sh (MB_GNUSTEP_SOURCE, MB_FINANCE_SOURCE): New variables.
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
all: generated-files which_lib$(EXEEXT)
|
||||
|
||||
which_lib$(EXEEXT): which_lib.c
|
||||
$(CC) -O2 -Wall -o $@ $^
|
||||
$(CC) @CFLAGS@ -Wall -o $@ $^
|
||||
|
||||
install: all
|
||||
$(srcdir)/mkinstalldirs $(prefix) $(makedir) \
|
||||
|
|
|
|||
4
README
4
README
|
|
@ -137,5 +137,5 @@ Questions and/or Bug Reports
|
|||
|
||||
The initial implementation was performed by Scott Christley
|
||||
<scottc@net-community.com> and Ovidiu Predescu <ovidiu@net-community.com>, so
|
||||
you may send questions and/or bug reports to them or to the GNUstep discussion
|
||||
mailing list at <discussion@gnustep.org>
|
||||
you may send questions and/or bug reports to them or to
|
||||
<bug-gnustep@gnu.org>
|
||||
|
|
|
|||
14
brain.make
14
brain.make
|
|
@ -125,6 +125,7 @@ ifeq ($(FOUNDATION_LIB),gnu)
|
|||
FND_LDFLAGS =
|
||||
FND_LIBS = -lgnustep-base
|
||||
FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
|
||||
GNUSTEP_DEFINE = -DGNUSTEP
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
|
|
@ -165,6 +166,7 @@ ifeq ($(GUI_LIB),gnu)
|
|||
GUI_LDFLAGS =
|
||||
GUI_LIBS = -lgnustep-gui -lgmodel -lgnustep-gui
|
||||
GUI_DEFINE = -DGNU_GUI_LIBRARY=1
|
||||
GNUSTEP_DEFINE = -DGNUSTEP
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_LIB),nx)
|
||||
|
|
@ -216,9 +218,9 @@ SYSTEM_LIBS =
|
|||
# then add X headers and libraries
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),xdps)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS)
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -ldpstk -ldps -lpsres -lX11
|
||||
endif
|
||||
|
||||
|
|
@ -227,16 +229,16 @@ endif
|
|||
# then add X headers and libraries
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),xraw)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS)
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -lX11
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_BACKEND_LIB),xgps)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE)
|
||||
SYSTEM_INCLUDES = $(X_INCLUDE) $(TIFF_INCLUDE) $(JPEG_INCLUDE)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR = $(X_LIBS)
|
||||
SYSTEM_LIB_DIR = $(X_LIBS) $(TIFF_LIB) $(JPEG_LIB)
|
||||
SYSTEM_LIBS = -ltiff -ljpeg -lX11
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -224,10 +224,6 @@ ifeq ($(OBJC_RUNTIME_LIB),nx)
|
|||
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
|
||||
endif
|
||||
|
||||
ifneq ($(debug), yes)
|
||||
OPTFLAG = -O2
|
||||
endif
|
||||
|
||||
# Enable building shared libraries by default. If the user wants to build a
|
||||
# static library, he/she has to specify shared=no explicitly.
|
||||
ifeq ($(HAVE_SHARED_LIBS), yes)
|
||||
|
|
@ -261,6 +257,7 @@ LIBRARY_NAME_SUFFIX := p$(LIBRARY_NAME_SUFFIX)
|
|||
endif
|
||||
|
||||
ifeq ($(debug), yes)
|
||||
OPTFLAG := $(filter-out -O%, $(OPTFLAG))
|
||||
ADDITIONAL_FLAGS += -g -DDEBUG
|
||||
OBJ_DIR_PREFIX += debug_
|
||||
LIBRARY_NAME_SUFFIX := d$(LIBRARY_NAME_SUFFIX)
|
||||
|
|
@ -272,6 +269,8 @@ ifneq ($(LIBRARY_NAME_SUFFIX),)
|
|||
LIBRARY_NAME_SUFFIX := _$(LIBRARY_NAME_SUFFIX)
|
||||
endif
|
||||
|
||||
AUXILIARY_CPPFLAGS += $(GNUSTEP_DEFINE) $(GNUSTEP_VERSION_DEFINE)
|
||||
|
||||
INTERNAL_OBJCFLAGS += $(ADDITIONAL_FLAGS) $(OPTFLAG) $(OBJCFLAGS) \
|
||||
$(RUNTIME_FLAG)
|
||||
INTERNAL_CFLAGS += $(ADDITIONAL_FLAGS) $(CFLAGS) $(OPTFLAG) $(RUNTIME_FLAG)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
# Binary and compile tools
|
||||
#
|
||||
CC = @CC@
|
||||
OPTFLAG = @CFLAGS@
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
OEXT = .o
|
||||
|
|
@ -57,6 +58,11 @@ INSTALL_DATA = @INSTALL_DATA@
|
|||
TAR = tar
|
||||
MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs
|
||||
|
||||
# Version information
|
||||
GNUSTEP_VERSION_DEFINE = -DGNUSTEP_VERSION=@GNUSTEP_VERSION@ \
|
||||
-DGNUSTEP_MAJOR_VERSION=@GNUSTEP_MAJOR_VERSION@ \
|
||||
-DGNUSTEP_MINOR_VERSION=@GNUSTEP_MINOR_VERSION@
|
||||
|
||||
# The default library combination
|
||||
default_library_combo = @ac_cv_library_combo@
|
||||
|
||||
|
|
@ -79,6 +85,31 @@ ifeq ($(X_LIBS),-LNONE)
|
|||
X_LIBS=
|
||||
endif
|
||||
|
||||
#
|
||||
# Tiff header and library
|
||||
#
|
||||
TIFF_INCLUDE := @TIFF_INCLUDE@
|
||||
ifeq ($(TIFF_INCLUDE),-INONE)
|
||||
TIFF_INCLUDE=
|
||||
endif
|
||||
TIFF_LIB := @TIFF_LIB@
|
||||
ifeq ($(TIFF_LIB),-LNONE)
|
||||
TIFF_LIB=
|
||||
endif
|
||||
|
||||
#
|
||||
# Jpeg header and library
|
||||
#
|
||||
JPEG_INCLUDE := @JPEG_INCLUDE@
|
||||
ifeq ($(JPEG_INCLUDE),-INONE)
|
||||
JPEG_INCLUDE=
|
||||
endif
|
||||
JPEG_LIB := @JPEG_LIB@
|
||||
ifeq ($(JPEG_LIB),-LNONE)
|
||||
JPEG_LIB=
|
||||
endif
|
||||
|
||||
|
||||
DPS_DEFINE=@DPS_DEFINE@
|
||||
|
||||
# Any user specified libs, like thread libraries
|
||||
|
|
|
|||
717
configure
vendored
717
configure
vendored
|
|
@ -20,6 +20,18 @@ fi`
|
|||
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"
|
||||
ac_help="$ac_help
|
||||
--with-dps-include=DIR DPS include files are in DIR"
|
||||
ac_help="$ac_help
|
||||
--with-jpeg-library=DIR JPEG library file are in DIR"
|
||||
ac_help="$ac_help
|
||||
--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"
|
||||
ac_help="$ac_help
|
||||
|
||||
--with-library-combo
|
||||
Define the default library combinations that will be used when you
|
||||
|
|
@ -615,7 +627,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
|||
fi
|
||||
|
||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||
echo "configure:619: checking host system type" >&5
|
||||
echo "configure:631: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -636,7 +648,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$host" 1>&6
|
||||
|
||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||
echo "configure:640: checking target system type" >&5
|
||||
echo "configure:652: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -654,7 +666,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
|||
echo "$ac_t""$target" 1>&6
|
||||
|
||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||
echo "configure:658: checking build system type" >&5
|
||||
echo "configure:670: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -689,7 +701,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:693: checking for $ac_word" >&5
|
||||
echo "configure:705: 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
|
||||
|
|
@ -718,7 +730,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:722: checking for $ac_word" >&5
|
||||
echo "configure:734: 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
|
||||
|
|
@ -766,7 +778,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:782: 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.
|
||||
|
|
@ -776,11 +788,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
|
|||
cross_compiling=$ac_cv_prog_cc_cross
|
||||
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 780 "configure"
|
||||
#line 792 "configure"
|
||||
#include "confdefs.h"
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
# If we can't run a trivial program, we are probably using a cross compiler.
|
||||
if (./conftest; exit) 2>/dev/null; then
|
||||
|
|
@ -800,12 +812,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:804: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:816: 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:809: checking whether we are using GNU C" >&5
|
||||
echo "configure:821: 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
|
||||
|
|
@ -814,7 +826,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:818: \"$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:830: \"$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
|
||||
|
|
@ -829,7 +841,7 @@ if test $ac_cv_prog_gcc = yes; then
|
|||
ac_save_CFLAGS="$CFLAGS"
|
||||
CFLAGS=
|
||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||
echo "configure:833: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:845: 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
|
||||
|
|
@ -857,7 +869,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:861: checking how to run the C preprocessor" >&5
|
||||
echo "configure:873: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -872,13 +884,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 876 "configure"
|
||||
#line 888 "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:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -889,13 +901,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 893 "configure"
|
||||
#line 905 "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:899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
:
|
||||
|
|
@ -920,7 +932,7 @@ echo "$ac_t""$CPP" 1>&6
|
|||
# Extract the first word of "ranlib", so it can be a program name with args.
|
||||
set dummy ranlib; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:924: checking for $ac_word" >&5
|
||||
echo "configure:936: 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
|
||||
|
|
@ -958,7 +970,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:962: checking for a BSD compatible install" >&5
|
||||
echo "configure:974: 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
|
||||
|
|
@ -1018,7 +1030,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1022: checking whether ln -s works" >&5
|
||||
echo "configure:1034: 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
|
||||
|
|
@ -1047,7 +1059,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:1051: checking for X" >&5
|
||||
echo "configure:1063: checking for X" >&5
|
||||
|
||||
# Check whether --with-x or --without-x was given.
|
||||
if test "${with_x+set}" = set; then
|
||||
|
|
@ -1109,12 +1121,12 @@ if test "$ac_x_includes" = NO; then
|
|||
|
||||
# First, try using that file with no special directory specified.
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1113 "configure"
|
||||
#line 1125 "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:1118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1183,14 +1195,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 1187 "configure"
|
||||
#line 1199 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
# We can link X programs with no special library path.
|
||||
|
|
@ -1288,205 +1300,35 @@ if test -r $x_includes/X11/DPS; then
|
|||
X_INCLUDE="$X_INCLUDE -I$x_includes/X11"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
ac_header_dirent=no
|
||||
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:1300: 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 1305 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
int main() {
|
||||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
ac_header_dirent=$ac_hdr; break
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
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:1338: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1346 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char opendir();
|
||||
|
||||
int main() {
|
||||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -ldir"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1379: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1387 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char opendir();
|
||||
|
||||
int main() {
|
||||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -lx"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/stat.h sys/errno.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1424: 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 1429 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=yes"
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for DPS
|
||||
#--------------------------------------------------------------------
|
||||
if test -f clean_cpu.sh; then
|
||||
transformed_host_cpu=`./clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`./clean_cpu.sh $target_cpu`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||
fi
|
||||
# Check whether --with-dps_library or --without-dps_library was given.
|
||||
if test "${with_dps_library+set}" = set; then
|
||||
withval="$with_dps_library"
|
||||
:
|
||||
else
|
||||
with_dps_library=
|
||||
fi
|
||||
|
||||
if test -f clean_os.sh; then
|
||||
transformed_host_os=`./clean_os.sh $host_os`
|
||||
transformed_target_os=`./clean_os.sh $target_os`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||
fi
|
||||
# Check whether --with-dps_include or --without-dps_include was given.
|
||||
if test "${with_dps_include+set}" = set; then
|
||||
withval="$with_dps_include"
|
||||
:
|
||||
else
|
||||
with_dps_include=
|
||||
fi
|
||||
|
||||
ac_cv_file_output_directory=Source/$transformed_host_cpu/$transformed_host_os
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
# check for dpsNXargs.h below looks at the appropriate target includes
|
||||
ORIG_CPPFLAGS=${CPPFLAGS}
|
||||
CPPFLAGS="-I${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
CPPFLAGS="-I${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
CPPFLAGS="-I${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
if test -n "$with_dps_include"; then
|
||||
X_INCLUDE="$X_INCLUDE -I$with_dps_include"
|
||||
if test -n "$with_dps_lib"; then
|
||||
X_LIBS="$X_LIBS -L$with_dps_lib"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} ${X_INCLUDE}"
|
||||
|
||||
# We care about this header file on the target not host system
|
||||
|
|
@ -1494,17 +1336,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:1498: checking for $ac_hdr" >&5
|
||||
echo "configure:1340: 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 1503 "configure"
|
||||
#line 1345 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1535,17 +1377,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:1539: checking for $ac_hdr" >&5
|
||||
echo "configure:1381: 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 1544 "configure"
|
||||
#line 1386 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
|
|
@ -1578,6 +1420,412 @@ CPPFLAGS=${ORIG_CPPFLAGS}
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
ac_header_dirent=no
|
||||
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:1431: 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 1436 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
int main() {
|
||||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
ac_header_dirent=$ac_hdr; break
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
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:1469: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1477 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char opendir();
|
||||
|
||||
int main() {
|
||||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -ldir"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1510: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1518 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char opendir();
|
||||
|
||||
int main() {
|
||||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
LIBS="$LIBS -lx"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
for ac_hdr in sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h sys/stat.h sys/errno.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
echo "configure:1555: 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 1560 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=yes"
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
|
||||
cat >> confdefs.h <<EOF
|
||||
#define $ac_tr_hdr 1
|
||||
EOF
|
||||
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for JPEG
|
||||
#--------------------------------------------------------------------
|
||||
# Check whether --with-jpeg_library or --without-jpeg_library was given.
|
||||
if test "${with_jpeg_library+set}" = set; then
|
||||
withval="$with_jpeg_library"
|
||||
:
|
||||
else
|
||||
with_jpeg_library=/usr/local/lib
|
||||
fi
|
||||
|
||||
# Check whether --with-jpeg_includes or --without-jpeg_includes was given.
|
||||
if test "${with_jpeg_includes+set}" = set; then
|
||||
withval="$with_jpeg_includes"
|
||||
:
|
||||
else
|
||||
with_jpeg_include=/usr/local/include
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$JPEG_LIB" = x; then
|
||||
jpeg_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L${with_jpeg_library} ${LIBS}"
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I${with_jpeg_include} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
|
||||
echo "configure:1621: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ljpeg $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1629 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char jpeg_destroy_decompress();
|
||||
|
||||
int main() {
|
||||
jpeg_destroy_decompress()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
jpeg_ok=yes
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
jpeg_ok=no
|
||||
echo "configure: warning: *** Cannot find libjpeg ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library JPEG library is required ***" 1>&2; exit 1; }
|
||||
fi
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
echo $ac_n "checking for jpeg.h""... $ac_c" 1>&6
|
||||
echo "configure:1665: checking for jpeg.h" >&5
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1667 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
#include <jpeglib.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
jpeg_ok=yes
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
jpeg_ok=no
|
||||
fi
|
||||
rm -f conftest*
|
||||
echo "$ac_t""$jpeg_ok" 1>&6
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
JPEG_LIB="-L${with_jpeg_library}"
|
||||
export JPEG_LIB
|
||||
JPEG_INCLUDE="-I${with_jpeg_include}"
|
||||
export JPEG_INCLUDE
|
||||
else
|
||||
echo "configure: warning: *** Cannot find libjpeg header ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library JPEG library is required ***" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
LIBS="${jpeg_check_lib_save_lib}"
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for TIFF
|
||||
#--------------------------------------------------------------------
|
||||
# Check whether --with-tiff_library or --without-tiff_library was given.
|
||||
if test "${with_tiff_library+set}" = set; then
|
||||
withval="$with_tiff_library"
|
||||
:
|
||||
else
|
||||
with_tiff_library=/usr/local/lib
|
||||
fi
|
||||
|
||||
# Check whether --with-tiff_includes or --without-tiff_includes was given.
|
||||
if test "${with_tiff_includes+set}" = set; then
|
||||
withval="$with_tiff_includes"
|
||||
:
|
||||
else
|
||||
with_tiff_include=/usr/local/include
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$TIFF_LIB" = x; then
|
||||
tiff_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L${with_tiff_library} ${JPEG_LIB} ${LIBS}"
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I${with_tiff_include} ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
|
||||
echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
||||
echo "configure:1736: 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
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ltiff -ljpeg -lm $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1744 "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
|
||||
builtin and then its argument prototype would still apply. */
|
||||
char TIFFReadScanline();
|
||||
|
||||
int main() {
|
||||
TIFFReadScanline()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
LIBS="$ac_save_LIBS"
|
||||
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
tiff_ok=yes
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
tiff_ok=no
|
||||
echo "configure: warning: *** Cannot find libtiff ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library TIFF library is required ***" 1>&2; exit 1; }
|
||||
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:1781: 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 1786 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tiffio.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=yes"
|
||||
else
|
||||
echo "$ac_err" >&5
|
||||
echo "configure: failed program was:" >&5
|
||||
cat conftest.$ac_ext >&5
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_$ac_safe=no"
|
||||
fi
|
||||
rm -f conftest*
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
tiff_ok=yes
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
tiff_ok=no
|
||||
fi
|
||||
|
||||
if test "$tiff_ok" = yes; then
|
||||
TIFF_LIB="-L${with_tiff_library}"
|
||||
export TIFF_LIB
|
||||
TIFF_INCLUDE="-I${with_tiff_include}"
|
||||
export TIFF_INCLUDE
|
||||
else
|
||||
echo "configure: warning: *** Cannot find libtiff header ***" 1>&2
|
||||
{ echo "configure: error: *** To build GUI library TIFF library is required ***" 1>&2; exit 1; }
|
||||
fi
|
||||
fi
|
||||
LIBS="${tiff_check_lib_save_lib}"
|
||||
CPPFLAGS="{tiff_check_lib_save_header}"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -1604,7 +1852,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:1608: checking whether objc has thread support" >&5
|
||||
echo "configure:1856: checking whether objc has thread support" >&5
|
||||
saved_LIBS="$LIBS"
|
||||
objc_thread_lib=""
|
||||
if test $host_os = linux-gnu; then
|
||||
|
|
@ -1613,11 +1861,11 @@ if test $host_os = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1617 "configure"
|
||||
#line 1865 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1635,11 +1883,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1639 "configure"
|
||||
#line 1887 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -1658,11 +1906,11 @@ else
|
|||
objc_threaded="-lthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1662 "configure"
|
||||
#line 1910 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread"
|
||||
else
|
||||
|
|
@ -1685,6 +1933,14 @@ ac_cv_objc_threaded=$objc_threaded
|
|||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
. ../Version
|
||||
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -1843,12 +2099,19 @@ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
|||
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||||
s%@HOST_INSTALL@%$HOST_INSTALL%g
|
||||
s%@LN_S@%$LN_S%g
|
||||
s%@DPS_DEFINE@%$DPS_DEFINE%g
|
||||
s%@X_INCLUDE@%$X_INCLUDE%g
|
||||
s%@X_LIBS@%$X_LIBS%g
|
||||
s%@DPS_DEFINE@%$DPS_DEFINE%g
|
||||
s%@JPEG_LIB@%$JPEG_LIB%g
|
||||
s%@JPEG_INCLUDE@%$JPEG_INCLUDE%g
|
||||
s%@TIFF_LIB@%$TIFF_LIB%g
|
||||
s%@TIFF_INCLUDE@%$TIFF_INCLUDE%g
|
||||
s%@ac_cv_library_combo@%$ac_cv_library_combo%g
|
||||
s%@objc_threaded@%$objc_threaded%g
|
||||
s%@ac_cv_objc_threaded@%$ac_cv_objc_threaded%g
|
||||
s%@GNUSTEP_VERSION@%$GNUSTEP_VERSION%g
|
||||
s%@GNUSTEP_MAJOR_VERSION@%$GNUSTEP_MAJOR_VERSION%g
|
||||
s%@GNUSTEP_MINOR_VERSION@%$GNUSTEP_MINOR_VERSION%g
|
||||
|
||||
CEOF
|
||||
EOF
|
||||
|
|
|
|||
153
configure.in
153
configure.in
|
|
@ -81,43 +81,25 @@ if test -r $x_includes/X11/DPS; then
|
|||
X_INCLUDE="$X_INCLUDE -I$x_includes/X11"
|
||||
fi
|
||||
|
||||
AC_SUBST(X_INCLUDE)
|
||||
AC_SUBST(X_LIBS)
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
||||
sys/stat.h sys/errno.h)
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for DPS
|
||||
#--------------------------------------------------------------------
|
||||
if test -f clean_cpu.sh; then
|
||||
transformed_host_cpu=`./clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`./clean_cpu.sh $target_cpu`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh; then
|
||||
transformed_host_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $host_cpu`
|
||||
transformed_target_cpu=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_cpu.sh $target_cpu`
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -f clean_os.sh; then
|
||||
transformed_host_os=`./clean_os.sh $host_os`
|
||||
transformed_target_os=`./clean_os.sh $target_os`
|
||||
else if test -f ${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh; then
|
||||
transformed_host_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $host_os`
|
||||
transformed_target_os=`${GNUSTEP_SYSTEM_ROOT}/Makefiles/clean_os.sh $target_os`
|
||||
fi
|
||||
fi
|
||||
|
||||
ac_cv_file_output_directory=Source/$transformed_host_cpu/$transformed_host_os
|
||||
AC_ARG_WITH(dps_library,
|
||||
[ --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=)
|
||||
|
||||
# Add the target header file directory as an include path so that the
|
||||
# check for dpsNXargs.h below looks at the appropriate target includes
|
||||
ORIG_CPPFLAGS=${CPPFLAGS}
|
||||
CPPFLAGS="-I${GNUSTEP_SYSTEM_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
CPPFLAGS="-I${GNUSTEP_LOCAL_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
CPPFLAGS="-I${GNUSTEP_USER_ROOT}/Headers/$transformed_target_cpu/$transformed_target_os ${CPPFLAGS}"
|
||||
if test -n "$with_dps_include"; then
|
||||
X_INCLUDE="$X_INCLUDE -I$with_dps_include"
|
||||
if test -n "$with_dps_lib"; then
|
||||
X_LIBS="$X_LIBS -L$with_dps_lib"
|
||||
fi
|
||||
fi
|
||||
CPPFLAGS="${CPPFLAGS} ${X_INCLUDE}"
|
||||
|
||||
# We care about this header file on the target not host system
|
||||
|
|
@ -131,6 +113,109 @@ AC_HAVE_HEADERS(DPS/dpsNXargs.h,
|
|||
CPPFLAGS=${ORIG_CPPFLAGS}
|
||||
|
||||
AC_SUBST(DPS_DEFINE)
|
||||
AC_SUBST(X_INCLUDE)
|
||||
AC_SUBST(X_LIBS)
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
AC_HAVE_HEADERS(sys/param.h sys/file.h dir.h string.h stdlib.h sys/types.h dnl
|
||||
sys/stat.h sys/errno.h)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for JPEG
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_WITH(jpeg_library,
|
||||
[ --with-jpeg-library=DIR JPEG library file are in DIR], ,
|
||||
with_jpeg_library=/usr/local/lib)
|
||||
AC_ARG_WITH(jpeg_includes,
|
||||
[ --with-jpeg-include=DIR JPEG include files are in DIR], ,
|
||||
with_jpeg_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_JPEGLIB,
|
||||
[jpeg_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L$1 ${LIBS}"
|
||||
jpeg_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I$2 ${CPPFLAGS}"
|
||||
|
||||
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
|
||||
jpeg_ok=yes,
|
||||
jpeg_ok=no
|
||||
AC_MSG_WARN(*** Cannot find libjpeg ***)
|
||||
AC_MSG_ERROR(*** To build GUI library JPEG library is required ***))
|
||||
if test "$jpeg_ok" = yes; then
|
||||
AC_MSG_CHECKING([for jpeg.h])
|
||||
AC_TRY_CPP([#include <stdio.h>
|
||||
#undef PACKAGE
|
||||
#undef VERSION
|
||||
#include <jpeglib.h>],
|
||||
jpeg_ok=yes,
|
||||
jpeg_ok=no)
|
||||
AC_MSG_RESULT($jpeg_ok)
|
||||
|
||||
if test "$jpeg_ok" = yes; then
|
||||
JPEG_LIB="-L$1"
|
||||
export JPEG_LIB
|
||||
JPEG_INCLUDE="-I$2"
|
||||
export JPEG_INCLUDE
|
||||
else
|
||||
AC_MSG_WARN(*** Cannot find libjpeg header ***)
|
||||
AC_MSG_ERROR(*** To build GUI library JPEG library is required ***)
|
||||
fi
|
||||
fi
|
||||
LIBS="${jpeg_check_lib_save_lib}"
|
||||
CPPFLAGS="${jpeg_check_lib_save_header}"])
|
||||
|
||||
if test "x$JPEG_LIB" = x; then
|
||||
AC_CHECK_JPEGLIB(${with_jpeg_library}, ${with_jpeg_include})
|
||||
fi
|
||||
|
||||
AC_SUBST(JPEG_LIB)
|
||||
AC_SUBST(JPEG_INCLUDE)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Find for TIFF
|
||||
#--------------------------------------------------------------------
|
||||
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_includes,
|
||||
[ --with-tiff-include=DIR TIFF include files are in DIR], ,
|
||||
with_tiff_include=/usr/local/include)
|
||||
|
||||
AC_DEFUN(AC_CHECK_TIFFLIB,
|
||||
[tiff_check_lib_save_lib=${LIBS}
|
||||
LIBS="-L$1 ${JPEG_LIB} ${LIBS}"
|
||||
tiff_check_lib_save_header=${CPPFLAGS}
|
||||
CPPFLAGS="-I$2 ${JPEG_INCLUDE} ${CPPFLAGS}"
|
||||
|
||||
AC_CHECK_LIB(tiff, TIFFReadScanline,
|
||||
tiff_ok=yes,
|
||||
tiff_ok=no
|
||||
AC_MSG_WARN(*** Cannot find libtiff ***)
|
||||
AC_MSG_ERROR(*** To build GUI library TIFF library is required ***),
|
||||
-ljpeg -lm)
|
||||
if test "$tiff_ok" = yes; then
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
tiff_ok=yes,
|
||||
tiff_ok=no)
|
||||
if test "$tiff_ok" = yes; then
|
||||
TIFF_LIB="-L$1"
|
||||
export TIFF_LIB
|
||||
TIFF_INCLUDE="-I$2"
|
||||
export TIFF_INCLUDE
|
||||
else
|
||||
AC_MSG_WARN(*** Cannot find libtiff header ***)
|
||||
AC_MSG_ERROR(*** To build GUI library TIFF library is required ***)
|
||||
fi
|
||||
fi
|
||||
LIBS="${tiff_check_lib_save_lib}"
|
||||
CPPFLAGS="{tiff_check_lib_save_header}"])
|
||||
|
||||
if test "x$TIFF_LIB" = x; then
|
||||
AC_CHECK_TIFFLIB(${with_tiff_library}, ${with_tiff_include})
|
||||
fi
|
||||
|
||||
AC_SUBST(TIFF_LIB)
|
||||
AC_SUBST(TIFF_INCLUDE)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
|
|
@ -186,6 +271,14 @@ ac_cv_objc_threaded=$objc_threaded
|
|||
AC_SUBST(objc_threaded)
|
||||
AC_SUBST(ac_cv_objc_threaded)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
. ../Version
|
||||
AC_SUBST(GNUSTEP_VERSION)
|
||||
AC_SUBST(GNUSTEP_MAJOR_VERSION)
|
||||
AC_SUBST(GNUSTEP_MINOR_VERSION)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Produce the output files
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -140,6 +140,7 @@ else
|
|||
fi
|
||||
|
||||
appname=`echo $app | sed 's/\.[a-z]*$//'`
|
||||
appname=`basename $appname`
|
||||
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
|
||||
|
||||
|
||||
|
|
|
|||
41
rules.make
41
rules.make
|
|
@ -137,15 +137,6 @@ LIB_DIRS_NO_SYSTEM = $(ADDITIONAL_LIB_DIRS) \
|
|||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
|
||||
|
||||
|
||||
ifneq ($(LIBRARIES_DEPEND_UPON),)
|
||||
LIBRARIES_DEPEND_UPON := \
|
||||
$(shell $(WHICH_LIB_SCRIPT) $(LIB_DIRS_NO_SYSTEM) $(LIBRARIES_DEPEND_UPON)\
|
||||
debug=$(debug) profile=$(profile) shared=$(shared) libext=$(LIBEXT) \
|
||||
shared_libext=$(SHARED_LIBEXT))
|
||||
endif
|
||||
|
||||
|
||||
#
|
||||
# The bundle extension (default is .bundle) is defined by BUNDLE_EXTENSION.
|
||||
#
|
||||
|
|
@ -173,17 +164,20 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
# The magical application rules, thank you GNU make!
|
||||
%.build:
|
||||
@(echo Making $(OPERATION) for $(TARGET_TYPE) $*...; \
|
||||
for f in $($*_SUBPROJECTS); do \
|
||||
mf=$(MAKEFILE_NAME); \
|
||||
if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \
|
||||
mf=Makefile; \
|
||||
echo "WARNING: No $(MAKEFILE_NAME) found for subproject $$f; using 'Makefile'"; \
|
||||
fi; \
|
||||
if $(MAKE) -C $$f -f $$mf --no-keep-going $(OPERATION); then \
|
||||
:; \
|
||||
else exit $$?; \
|
||||
fi; \
|
||||
done; \
|
||||
tmp="$($*_SUBPROJECTS)"; \
|
||||
if test "x$(tmp)" != x ; then \
|
||||
for f in $tmp; do \
|
||||
mf=$(MAKEFILE_NAME); \
|
||||
if [ ! -f $$f/$$mf -a -f $$f/Makefile ]; then \
|
||||
mf=Makefile; \
|
||||
echo "WARNING: No $(MAKEFILE_NAME) found for subproject $$f; using 'Makefile'"; \
|
||||
fi; \
|
||||
if $(MAKE) -C $$f -f $$mf --no-keep-going $(OPERATION); then \
|
||||
:; \
|
||||
else exit $$?; \
|
||||
fi; \
|
||||
done; \
|
||||
fi; \
|
||||
$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
|
||||
internal-$(TARGET_TYPE)-$(OPERATION) \
|
||||
INTERNAL_$(TARGET_TYPE)_NAME=$* \
|
||||
|
|
@ -210,8 +204,11 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
|
|||
ADDITIONAL_LIBRARY_LIBS="$($*_LIBS)" \
|
||||
ADDITIONAL_LIB_DIRS="$($*_LIB_DIRS) $(ADDITIONAL_LIB_DIRS)" \
|
||||
ADDITIONAL_LDFLAGS="$($*_LDFLAGS) $(ADDITIONAL_LDFLAGS)" \
|
||||
LIBRARIES_DEPEND_UPON="$($*_LIBRARIES_DEPEND_UPON) \
|
||||
$(LIBRARIES_DEPEND_UPON)" \
|
||||
LIBRARIES_DEPEND_UPON="$(shell $(WHICH_LIB_SCRIPT) \
|
||||
$(LIB_DIRS_NO_SYSTEM) $(LIBRARIES_DEPEND_UPON) \
|
||||
$($*_LIBRARIES_DEPEND_UPON) debug=$(debug) profile=$(profile) \
|
||||
shared=$(shared) libext=$(LIBEXT) \
|
||||
shared_libext=$(SHARED_LIBEXT))" \
|
||||
SCRIPTS_DIRECTORY="$($*_SCRIPTS_DIRECTORY)" \
|
||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
||||
)
|
||||
|
|
|
|||
|
|
@ -119,7 +119,8 @@ $(SERVICE_DIR_NAME)/Resources/Info-gnustep.plist: \
|
|||
echo "}") >$@ ;\
|
||||
if [ -n "$(GNUSTEP_OBJ_DIR)" ];then \
|
||||
_d=$(GNUSTEP_OBJ_DIR)/; \
|
||||
LD_LIBRARY_PATH=../../base/Source/$$_d:../Source/$$_d; \
|
||||
tmp=`echo ${SYSTEM_LIB_DIR} | sed -e 's/ //g' | sed -e 's/-L/:/g'`; \
|
||||
LD_LIBRARY_PATH="../../base/Source/$$_d:../Source/$$_d$$tmp"; \
|
||||
export LD_LIBRARY_PATH; \
|
||||
fi; \
|
||||
if $${_d}make_services --test $@; then : ; else rm -f $@; false; fi
|
||||
|
|
|
|||
16
target.make
16
target.make
|
|
@ -254,7 +254,14 @@ ifeq ($(GNUSTEP_TARGET_OS), linux-gnu)
|
|||
HAVE_SHARED_LIBS = yes
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
$(CC) -shared -Wl,-soname,$(SONAME_LIBRARY_FILE) \
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
|
||||
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ \
|
||||
$(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR) \
|
||||
$(ADDITIONAL_LIB_DIRS) \
|
||||
$(LIBRARIES_DEPEND_UPON) \
|
||||
$(TARGET_SYSTEM_LIBS); \
|
||||
(cd $(GNUSTEP_OBJ_DIR); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
|
|
@ -414,8 +421,8 @@ STATIC_LIB_LINK_CMD = \
|
|||
$(VERSION_LIBRARY_FILE) `ls -1 *\.o */*\.o`);\
|
||||
$(RANLIB) $(VERSION_LIBRARY_FILE)
|
||||
SHARED_LIB_LINK_CMD = \
|
||||
(cd $(GNUSTEP_OBJ_DIR); $(CC) -v $(SHARED_CFLAGS) -shared -o
|
||||
$(VERSION_LIBRARY_FILE) `ls -1 *\.o */*\.o` ;\
|
||||
(cd $(GNUSTEP_OBJ_DIR); $(CC) -v $(SHARED_CFLAGS) -shared -o \
|
||||
$(VERSION_LIBRARY_FILE) `ls -1 *\.o */*\.o` ;\
|
||||
rm -f $(LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
|
||||
|
||||
|
|
@ -448,9 +455,6 @@ SHARED_LIB_LINK_CMD = \
|
|||
)
|
||||
AFTER_INSTALL_SHARED_LIB_COMMAND = \
|
||||
(cd $(GNUSTEP_LIBRARIES); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRSTEP_LIBRARIES); \
|
||||
rm -f $(LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \
|
||||
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
|
||||
|
|
|
|||
Loading…
Reference in a new issue