mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
GUI Backend built as bundle by default. Remove backend component
of LIBRARY_COMBO throughout makefiles and scripts. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@9577 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
be673f8d89
commit
a3da36ba3d
19 changed files with 249 additions and 468 deletions
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
2001-04-13 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* GUI Backend built as bundle by default. Remove backend component
|
||||
of LIBRARY_COMBO throughout makefiles and scripts.
|
||||
* configure.in: Add enable-backend-bundle.
|
||||
* config.make.in: Define BACKEND_BUNDLE.
|
||||
|
||||
* Documenation/DESIGN,gnustep-howto.texi,install.texi: Update.
|
||||
|
||||
* openapp.in: Simplify - use executable.template script for work.
|
||||
* opentool.in: Likewise.
|
||||
(patches from Jeff Teunissen <deek@dusknet.dhs.org>).
|
||||
|
||||
Wed Apr 11 12:03:55 2001 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
|
||||
* documentation.make [TEXI_FILES] ($(INTERNAL_doc_NAME)_toc.html):
|
||||
|
|
|
|||
|
|
@ -53,37 +53,31 @@ be compiled for these combinations:
|
|||
Objective-C runtime: NeXT, GNU
|
||||
Foundation library: NeXT, PDO, gnustep-base, libFoundation
|
||||
GUI library: NeXT, gnustep-gui
|
||||
Back-end library: nil, XDPS, Win32
|
||||
|
||||
The back-end library is required if the GUI library used is
|
||||
gnustep-gui. It is "nil" if the GUI library is NeXT's AppKit. We'll
|
||||
use the following abbreviations to identify different parts:
|
||||
|
||||
Objective-C runtime: nx (for NeXT), gnu (for GNU)
|
||||
Foundation library: nx (for NeXT), pdo (for PDO), gnu (for gnustep-base),
|
||||
fd (for libFoundation)
|
||||
GUI library: nx (for NeXT), gnu (for gnustep-gui)
|
||||
Back-end library: nil (for none), xdps (for XDPS), w32 (for Win32)
|
||||
|
||||
We'll denote the fact that an application was compiled for a certain
|
||||
combination of the above values by using the abbreviations of the
|
||||
different subsystems and placing dashes between them. For example
|
||||
an application compiled for NeXT Foundation using NeXT AppKit will
|
||||
have the compile attribute nx-nx-nx-nil. An application compiled for
|
||||
have the compile attribute nx-nx-nx. An application compiled for
|
||||
PDO with the gnustep-gui library under Unix will be denoted by
|
||||
nx-pdo-gnu-xdps and another one compiled for gnustep-base using
|
||||
gnustep-gui under Unix will be denoted by gnu-gnu-gnu-xdps. Here is a
|
||||
nx-pdo-gnu and another one compiled for gnustep-base using
|
||||
gnustep-gui under Unix will be denoted by gnu-gnu-gnu. Here is a
|
||||
list of some of the possible combinations:
|
||||
|
||||
ObjC runtime Foundation GUI Backend
|
||||
------------ ---------- --- --------
|
||||
nx nx nx nil
|
||||
nx pdo nx nil
|
||||
nx pdo gnu xdps
|
||||
gnu gnu gnu xdps
|
||||
gnu gnu gnu w32
|
||||
nx fd gnu xdps
|
||||
gnu fd gnu xdps
|
||||
ObjC runtime Foundation GUI
|
||||
------------ ---------- ---
|
||||
nx nx nx
|
||||
nx pdo nx
|
||||
nx pdo gnu
|
||||
gnu gnu gnu
|
||||
gnu gnu gnu
|
||||
nx fd gnu
|
||||
gnu fd gnu
|
||||
|
||||
Note that one can choose his/her own packages to build; it is not
|
||||
required to have all the packages installed on the system. Not having
|
||||
|
|
@ -131,19 +125,16 @@ several combinations of packages:
|
|||
Libraries/
|
||||
i386/
|
||||
linux-gnu/
|
||||
gnu-gnu-gnu-xdps/
|
||||
gnu-gnu-gnu/
|
||||
libgnustep-base.so
|
||||
libgnustep-gui.so
|
||||
libgnustep-xdps.so
|
||||
gnu-fd-gnu-xdps/
|
||||
gnu-fd-gnu/
|
||||
libFoundation.so
|
||||
libgnustep-gui.so
|
||||
libgnustep-xdps.so
|
||||
sparc/
|
||||
solaris-2.5.1/
|
||||
nx-pdo-gnu-xdps/
|
||||
nx-pdo-gnu/
|
||||
libgnustep-gui.so
|
||||
libgnustep-xdps.so
|
||||
|
||||
Please note that the Libraries/ directory contains only the libraries
|
||||
that come with GNUstep, the PDO library for example is not inside
|
||||
|
|
@ -185,11 +176,11 @@ Apps/
|
|||
InterfaceModeller (for OPENSTEP systems compatibility)
|
||||
i386/
|
||||
linux-gnu/
|
||||
gnu-gnu-gnu-xdps/
|
||||
gnu-gnu-gnu/
|
||||
InterfaceModeller
|
||||
sparc/
|
||||
solaris-2.5.1/
|
||||
nx-pdo-gnu-xdps/
|
||||
nx-pdo-gnu/
|
||||
InterfaceModeller
|
||||
|
||||
The Tools/ directory contains command line tools. Each tool
|
||||
|
|
@ -280,7 +271,7 @@ For instance if you want to choose to compile using the NeXT's PDO
|
|||
Foundation and use the GNUstep GUI library on a Unix machine you can
|
||||
do like this:
|
||||
|
||||
$ make library_combo=nx-pdo-gnu-xdps
|
||||
$ make library_combo=nx-pdo-gnu
|
||||
|
||||
|
||||
Projects that require running configure before compiling
|
||||
|
|
@ -490,4 +481,4 @@ The makefile package is installed under $(GNUSTEP_SYSTEM_ROOT)/Makefiles.
|
|||
|
||||
Ovidiu Predescu
|
||||
|
||||
Last updated: October, 1997
|
||||
Last updated: April, 2001
|
||||
|
|
|
|||
|
|
@ -274,12 +274,10 @@ The 'set_show_service' program
|
|||
should be permitted to offer on it's 'services' menu.
|
||||
@end example
|
||||
|
||||
If you want to see a sample GUI application running - you need to
|
||||
build GNUstep for use with the 'xgps' library (configuring it with
|
||||
with the option --with-library-combo=gnu-gnu-gnu-xgps) and look at the
|
||||
example applications in the gstep-examples package.
|
||||
Build 'Finger' or 'Ink' and start it with 'openapp
|
||||
Finger.app' or 'openapp Ink.app'
|
||||
If you want to see a sample GUI application running you need to build
|
||||
GNUstep and look at the example applications in the gstep-examples
|
||||
package. Build 'Finger' or 'Ink' and start it with 'openapp Finger.app'
|
||||
or 'openapp Ink.app'
|
||||
|
||||
To look best - use WindowMaker (the currently preferred GNUstep
|
||||
window manager) as your window manager.
|
||||
|
|
|
|||
|
|
@ -237,17 +237,6 @@ configure will use /usr/GNUstep/System as the default root directory.
|
|||
@node Alternate Library Setup, Individual Packages, Core Package, Core Package
|
||||
@subsection Alternate Library Setup
|
||||
|
||||
You can specify compilation of alternate libraries by using the
|
||||
--with-library-combo option:
|
||||
|
||||
@example
|
||||
./configure --with-library-combo=gnu-gnu-gnu-xdps
|
||||
@end example
|
||||
|
||||
to compile with the xdps library rather than the default xgps backend.
|
||||
IMPORTANT: The xdps backend is still experimental. Do not use it unless
|
||||
you are willing to deal with PostScript problems and other bugs.
|
||||
|
||||
Read the installation instructions in the Makefile package (make) for more
|
||||
installation options. Make sure you use the same
|
||||
configuration options when configuring each GNUstep library.
|
||||
|
|
|
|||
|
|
@ -71,6 +71,20 @@ compile, and also when you install).
|
|||
* Flat Structure::
|
||||
@end menu
|
||||
|
||||
@node Backend Bundles, Cross-Compiling, Configuration, Configuration
|
||||
@subsection Backend Bundles
|
||||
|
||||
By default, the gnustep-make package specifies that GUI backends are built
|
||||
as a bundle and loaded in at runtime. This allows one to switch backends
|
||||
by simply redefining a user default. If you do not want this behavior (for
|
||||
instance, if bundles do not work on your platform), it can be disabled using
|
||||
|
||||
@example
|
||||
--disable-backend-bundle
|
||||
@end
|
||||
|
||||
in the arguments to configure.
|
||||
|
||||
@node Alternate Libraries, Cross-Compiling, Configuration, Configuration
|
||||
@subsection Alternate Library Setup
|
||||
|
||||
|
|
@ -79,12 +93,10 @@ with-library-combo option. You need to have these libraries unpacked in a
|
|||
subdirectory under the gstep directory, then you can say
|
||||
|
||||
@example
|
||||
./configure --with-library-combo=gnu-gnu-gnu-xdps
|
||||
./configure --with-library-combo=nx-gnu-gnu
|
||||
@end example
|
||||
|
||||
to compile with the xdps library rather than the default xgps backend.
|
||||
IMPORTANT: The xdps backend is still experimental. Do not use it unless
|
||||
you are willing to deal with PostScript problems and other bugs.
|
||||
to compile with Apple's (NexT's) runtime on Darwin, for example.
|
||||
|
||||
@node Cross-Compiling, Flat Structure, Alternate Libraries, Configuration
|
||||
@subsection Configuring the GNUstep makefile package for a cross-compile target
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ have a GCC ObjC Compiler, so you need to use the ObjC runtime that comes with
|
|||
Darwin. To do this configure (gnustep-make) like this:
|
||||
|
||||
@example
|
||||
./configure --with-library-combo=nx-gnu-gnu-xgps
|
||||
./configure --with-library-combo=nx-gnu-gnu
|
||||
@end example
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -157,6 +157,16 @@ clean:
|
|||
distclean: clean
|
||||
rm -f GNUmakefile config.make
|
||||
rm -f config.cache config.log config.status
|
||||
rm -f openapp
|
||||
rm -f debugapp
|
||||
rm -f which_lib.pl
|
||||
rm -f opentool
|
||||
rm -f executable.template
|
||||
rm -f GNUmakefile
|
||||
rm -f GNUstep.sh
|
||||
rm -f GNUstep.csh
|
||||
rm -f gnustep-make.spec
|
||||
rm -f Documentation/GNUmakefile
|
||||
|
||||
cvs-tag:
|
||||
cvs -z3 rtag make-$(VERTAG) make
|
||||
|
|
|
|||
54
brain.make
54
brain.make
|
|
@ -33,23 +33,15 @@ else
|
|||
endif
|
||||
|
||||
ifeq ($(library_combo),nx)
|
||||
the_library_combo=nx-nx-nx-nil
|
||||
the_library_combo=nx-nx-nx
|
||||
endif
|
||||
|
||||
ifeq ($(library_combo),gnu-xdps)
|
||||
the_library_combo=gnu-gnu-gnu-xdps
|
||||
ifeq ($(library_combo),gnu)
|
||||
the_library_combo=gnu-gnu-gnu
|
||||
endif
|
||||
|
||||
ifeq ($(library_combo),fd-xdps)
|
||||
the_library_combo=gnu-fd-gnu-xdps
|
||||
endif
|
||||
|
||||
ifeq ($(library_combo),gnu-xraw)
|
||||
the_library_combo=gnu-gnu-gnu-xraw
|
||||
endif
|
||||
|
||||
ifeq ($(library_combo),fd-xraw)
|
||||
the_library_combo=gnu-fd-gnu-xraw
|
||||
ifeq ($(library_combo),fd)
|
||||
the_library_combo=gnu-fd-gnu
|
||||
endif
|
||||
|
||||
ifeq ($(the_library_combo),)
|
||||
|
|
@ -65,7 +57,6 @@ combo_list = $(subst -, ,$(the_library_combo))
|
|||
OBJC_RUNTIME_LIB = $(word 1,$(combo_list))
|
||||
FOUNDATION_LIB = $(word 2,$(combo_list))
|
||||
GUI_LIB = $(word 3,$(combo_list))
|
||||
GUI_BACKEND_LIB = $(word 4,$(combo_list))
|
||||
|
||||
#
|
||||
# Allow user specify the runtime, foundation, gui and backend libraries in
|
||||
|
|
@ -83,14 +74,10 @@ ifneq ($(gui),)
|
|||
GUI_LIB = $(gui)
|
||||
endif
|
||||
|
||||
ifneq ($(backend),)
|
||||
GUI_BACKEND_LIB = $(backend)
|
||||
endif
|
||||
|
||||
ifeq ($(gc), yes)
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)-gc
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-gc
|
||||
else
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)
|
||||
endif
|
||||
|
||||
OBJC_LDFLAGS =
|
||||
|
|
@ -196,38 +183,11 @@ ifeq ($(GUI_LIB),nx)
|
|||
endif
|
||||
endif
|
||||
|
||||
BACKEND_LDFLAGS =
|
||||
BACKEND_LIBS =
|
||||
#
|
||||
# Set the GUI Backend library
|
||||
#
|
||||
|
||||
SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR =
|
||||
SYSTEM_LIBS =
|
||||
|
||||
#
|
||||
# FIXME - when we have a win32 backend, move these flags inside
|
||||
# $(GNUSTEP_MAKEFILES)/Additional/win32.make and have them managed
|
||||
# by the win32 backend directly
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),w32)
|
||||
BACKEND_LDFLAGS =
|
||||
BACKEND_LIBS = -lMBKit
|
||||
endif
|
||||
#
|
||||
# If the backend GUI library is Win32 based
|
||||
# then add Win32 headers and libraries
|
||||
#
|
||||
ifeq ($(GUI_BACKEND_LIB),w32)
|
||||
SYSTEM_INCLUDES = $(CONFIG_SYSTEM_INCL)
|
||||
SYSTEM_LDFLAGS =
|
||||
SYSTEM_LIB_DIR =
|
||||
SYSTEM_LIBS = -ltiff -lwsock32 -ladvapi32 -lcomctl32 -luser32 \
|
||||
-lgdi32 -lcomdlg32
|
||||
endif
|
||||
|
||||
## Local variables:
|
||||
## mode: makefile
|
||||
## End:
|
||||
|
|
|
|||
|
|
@ -453,7 +453,7 @@ ifneq ($(LIBRARY_NAME_SUFFIX),)
|
|||
LIBRARY_NAME_SUFFIX := _$(LIBRARY_NAME_SUFFIX)
|
||||
endif
|
||||
|
||||
AUXILIARY_CPPFLAGS += $(GNUSTEP_DEFINE) $(GNUSTEP_VERSION_DEFINE) \
|
||||
AUXILIARY_CPPFLAGS += $(GNUSTEP_DEFINE) \
|
||||
$(FND_DEFINE) $(GUI_DEFINE) $(BACKEND_DEFINE) $(RUNTIME_DEFINE) \
|
||||
$(FOUNDATION_LIBRARY_DEFINE)
|
||||
|
||||
|
|
|
|||
|
|
@ -59,14 +59,12 @@ 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@
|
||||
|
||||
# Backend bundle
|
||||
BACKEND_BUNDLE=@BACKEND_BUNDLE@
|
||||
|
||||
#
|
||||
# Do threading stuff.
|
||||
#
|
||||
|
|
|
|||
168
configure
vendored
168
configure
vendored
|
|
@ -35,13 +35,15 @@ to have the GNUSTEP_NETWORK_ROOT directory in a non-standard place. Example:
|
|||
ac_help="$ac_help
|
||||
--enable-flattened Use flattened directory structure"
|
||||
ac_help="$ac_help
|
||||
--disable-backend-bundle Compile gui backend as a library"
|
||||
ac_help="$ac_help
|
||||
|
||||
--with-library-combo
|
||||
Define the default library combinations that will be used when you
|
||||
type 'make'. You can still change the library combination at runtime
|
||||
by specifying the 'library_combo' make variable. For example:
|
||||
|
||||
$ make library_combo=nx-pdo-nx-nil
|
||||
$ make library_combo=nx-pdo-nx
|
||||
"
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -661,6 +663,25 @@ else
|
|||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Build backend bundles (on by default)
|
||||
#--------------------------------------------------------------------
|
||||
# Check whether --enable-backend-bundle or --disable-backend-bundle was given.
|
||||
if test "${enable_backend_bundle+set}" = set; then
|
||||
enableval="$enable_backend_bundle"
|
||||
ac_cv_backend=$enableval
|
||||
else
|
||||
ac_cv_backend="yes"
|
||||
fi
|
||||
|
||||
|
||||
if test "$ac_cv_backend" = "yes"; then
|
||||
BACKEND_BUNDLE=yes;
|
||||
else
|
||||
BACKEND_BUNDLE=;
|
||||
fi
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -668,7 +689,7 @@ targetArgument=${target}
|
|||
# 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:672: checking for $ac_word" >&5
|
||||
echo "configure:693: 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
|
||||
|
|
@ -698,7 +719,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:702: checking for $ac_word" >&5
|
||||
echo "configure:723: 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
|
||||
|
|
@ -749,7 +770,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:753: checking for $ac_word" >&5
|
||||
echo "configure:774: 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
|
||||
|
|
@ -781,7 +802,7 @@ fi
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
|
||||
echo "configure:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
|
||||
echo "configure:806: 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.
|
||||
|
|
@ -792,12 +813,12 @@ cross_compiling=$ac_cv_prog_cc_cross
|
|||
|
||||
cat > conftest.$ac_ext << EOF
|
||||
|
||||
#line 796 "configure"
|
||||
#line 817 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:822: \"$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
|
||||
|
|
@ -823,12 +844,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:827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
|
||||
echo "configure:848: 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:832: checking whether we are using GNU C" >&5
|
||||
echo "configure:853: 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
|
||||
|
|
@ -837,7 +858,7 @@ else
|
|||
yes;
|
||||
#endif
|
||||
EOF
|
||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:841: \"$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:862: \"$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
|
||||
|
|
@ -856,7 +877,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:860: checking whether ${CC-cc} accepts -g" >&5
|
||||
echo "configure:881: 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
|
||||
|
|
@ -888,7 +909,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||
echo "configure:892: checking how to run the C preprocessor" >&5
|
||||
echo "configure:913: checking how to run the C preprocessor" >&5
|
||||
# On Suns, sometimes $CPP names a directory.
|
||||
if test -n "$CPP" && test -d "$CPP"; then
|
||||
CPP=
|
||||
|
|
@ -903,13 +924,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 907 "configure"
|
||||
#line 928 "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:913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:934: \"$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
|
||||
:
|
||||
|
|
@ -920,13 +941,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -E -traditional-cpp"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 924 "configure"
|
||||
#line 945 "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:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:951: \"$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
|
||||
:
|
||||
|
|
@ -937,13 +958,13 @@ else
|
|||
rm -rf conftest*
|
||||
CPP="${CC-cc} -nologo -E"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 941 "configure"
|
||||
#line 962 "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:947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:968: \"$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
|
||||
:
|
||||
|
|
@ -1014,7 +1035,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:1018: checking host system type" >&5
|
||||
echo "configure:1039: checking host system type" >&5
|
||||
|
||||
host_alias=$host
|
||||
case "$host_alias" in
|
||||
|
|
@ -1035,7 +1056,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:1039: checking target system type" >&5
|
||||
echo "configure:1060: checking target system type" >&5
|
||||
|
||||
target_alias=$target
|
||||
case "$target_alias" in
|
||||
|
|
@ -1053,7 +1074,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:1057: checking build system type" >&5
|
||||
echo "configure:1078: checking build system type" >&5
|
||||
|
||||
build_alias=$build
|
||||
case "$build_alias" in
|
||||
|
|
@ -1088,15 +1109,9 @@ fi
|
|||
|
||||
if test "$ac_cv_library_combo" = ""; then
|
||||
if test $host_os = nextstep4; then
|
||||
ac_cv_library_combo=nx-nx-nx-nil
|
||||
elif test $host_os = cygwin; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
elif test $host_os = mingw32; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
elif test $host_os = mingw; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
ac_cv_library_combo=nx-nx-nx
|
||||
else
|
||||
ac_cv_library_combo=gnu-gnu-gnu-xgps
|
||||
ac_cv_library_combo=gnu-gnu-gnu
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -1113,12 +1128,12 @@ esac
|
|||
# Determine the host, build, and target systems
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:1117: checking for Cygwin environment" >&5
|
||||
echo "configure:1132: checking for Cygwin environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1122 "configure"
|
||||
#line 1137 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
|
@ -1129,7 +1144,7 @@ int main() {
|
|||
return __CYGWIN__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cygwin=yes
|
||||
else
|
||||
|
|
@ -1146,19 +1161,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
|
|||
CYGWIN=
|
||||
test "$ac_cv_cygwin" = yes && CYGWIN=yes
|
||||
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
|
||||
echo "configure:1150: checking for mingw32 environment" >&5
|
||||
echo "configure:1165: checking for mingw32 environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1155 "configure"
|
||||
#line 1170 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_mingw32=yes
|
||||
else
|
||||
|
|
@ -1177,7 +1192,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
|
|||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:1181: checking for executable suffix" >&5
|
||||
echo "configure:1196: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1187,7 +1202,7 @@ else
|
|||
rm -f conftest*
|
||||
echo 'int main () { return 0; }' > conftest.$ac_ext
|
||||
ac_cv_exeext=
|
||||
if { (eval echo configure:1191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.c | *.o | *.obj) ;;
|
||||
|
|
@ -1208,13 +1223,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
|
|||
ac_exeext=$EXEEXT
|
||||
|
||||
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
|
||||
echo "configure:1212: checking for object suffix" >&5
|
||||
echo "configure:1227: checking for object suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
rm -f conftest*
|
||||
echo 'int i = 1;' > conftest.$ac_ext
|
||||
if { (eval echo configure:1218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
for ac_file in conftest.*; do
|
||||
case $ac_file in
|
||||
*.c) ;;
|
||||
|
|
@ -1255,7 +1270,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:1259: checking for $ac_word" >&5
|
||||
echo "configure:1274: 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
|
||||
|
|
@ -1285,7 +1300,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:1289: checking for $ac_word" >&5
|
||||
echo "configure:1304: 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
|
||||
|
|
@ -1315,7 +1330,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:1319: checking for $ac_word" >&5
|
||||
echo "configure:1334: 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
|
||||
|
|
@ -1345,7 +1360,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:1349: checking for $ac_word" >&5
|
||||
echo "configure:1364: 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
|
||||
|
|
@ -1376,7 +1391,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:1380: checking for $ac_word" >&5
|
||||
echo "configure:1395: 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
|
||||
|
|
@ -1405,7 +1420,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:1409: checking for $ac_word" >&5
|
||||
echo "configure:1424: 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
|
||||
|
|
@ -1434,7 +1449,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:1438: checking for $ac_word" >&5
|
||||
echo "configure:1453: 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
|
||||
|
|
@ -1466,7 +1481,7 @@ fi
|
|||
# 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:1470: checking for $ac_word" >&5
|
||||
echo "configure:1485: 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
|
||||
|
|
@ -1512,7 +1527,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:1516: checking for a BSD compatible install" >&5
|
||||
echo "configure:1531: 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
|
||||
|
|
@ -1575,7 +1590,7 @@ else
|
|||
fi
|
||||
|
||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||
echo "configure:1579: checking whether ln -s works" >&5
|
||||
echo "configure:1594: 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
|
||||
|
|
@ -1601,7 +1616,7 @@ do
|
|||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||
echo "configure:1605: checking for $ac_word" >&5
|
||||
echo "configure:1620: checking for $ac_word" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1661,7 +1676,7 @@ fi
|
|||
# If so, there are probably other libraries that we want there also, so
|
||||
# leave the proper includes in CPPFLAGS and LDFLAGS
|
||||
echo $ac_n "checking for alternate objc library""... $ac_c" 1>&6
|
||||
echo "configure:1665: checking for alternate objc library" >&5
|
||||
echo "configure:1680: checking for alternate objc library" >&5
|
||||
if eval "test \"`echo '$''{'gs_cv_objc_libdir'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -1703,12 +1718,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:1707: checking for $ac_hdr that defines DIR" >&5
|
||||
echo "configure:1722: 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 1712 "configure"
|
||||
#line 1727 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sys/types.h>
|
||||
#include <$ac_hdr>
|
||||
|
|
@ -1716,7 +1731,7 @@ int main() {
|
|||
DIR *dirp = 0;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:1735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_header_dirent_$ac_safe=yes"
|
||||
else
|
||||
|
|
@ -1741,7 +1756,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:1745: checking for opendir in -ldir" >&5
|
||||
echo "configure:1760: 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
|
||||
|
|
@ -1749,7 +1764,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldir $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1753 "configure"
|
||||
#line 1768 "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
|
||||
|
|
@ -1760,7 +1775,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1779: \"$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
|
||||
|
|
@ -1782,7 +1797,7 @@ fi
|
|||
|
||||
else
|
||||
echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
|
||||
echo "configure:1786: checking for opendir in -lx" >&5
|
||||
echo "configure:1801: 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
|
||||
|
|
@ -1790,7 +1805,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1794 "configure"
|
||||
#line 1809 "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
|
||||
|
|
@ -1801,7 +1816,7 @@ int main() {
|
|||
opendir()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:1805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:1820: \"$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
|
||||
|
|
@ -1827,17 +1842,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:1831: checking for $ac_hdr" >&5
|
||||
echo "configure:1846: 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 1836 "configure"
|
||||
#line 1851 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <$ac_hdr>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:1841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:1856: \"$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*
|
||||
|
|
@ -1868,7 +1883,7 @@ done
|
|||
# Check if libobjc was compiled with thread support.
|
||||
#--------------------------------------------------------------------
|
||||
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
|
||||
echo "configure:1872: checking whether objc has thread support" >&5
|
||||
echo "configure:1887: checking whether objc has thread support" >&5
|
||||
extra_LIBS=""
|
||||
case "${target_os}" in
|
||||
solaris*)
|
||||
|
|
@ -1884,11 +1899,11 @@ if test "$host_os" = linux-gnu; then
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1888 "configure"
|
||||
#line 1903 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1906,11 +1921,11 @@ elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
|
|||
objc_threaded="-pthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1910 "configure"
|
||||
#line 1925 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-pthread"
|
||||
else
|
||||
|
|
@ -1928,11 +1943,11 @@ fi
|
|||
objc_threaded="-lpthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1932 "configure"
|
||||
#line 1947 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpthread"
|
||||
else
|
||||
|
|
@ -1951,11 +1966,11 @@ fi
|
|||
objc_threaded="-lpcthread"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1955 "configure"
|
||||
#line 1970 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lpcthread"
|
||||
else
|
||||
|
|
@ -1975,11 +1990,11 @@ elif test "$MINGW32" = yes; then
|
|||
objc_threaded="works"
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1979 "configure"
|
||||
#line 1994 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="works"
|
||||
else
|
||||
|
|
@ -1997,11 +2012,11 @@ else
|
|||
objc_threaded=""
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2001 "configure"
|
||||
#line 2016 "configure"
|
||||
#include "confdefs.h"
|
||||
#include "config_thread.m"
|
||||
EOF
|
||||
if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
if { (eval echo configure:2020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
then
|
||||
objc_threaded="-lthread $extra_LIBS"
|
||||
else
|
||||
|
|
@ -2186,6 +2201,7 @@ s%@root_prefix@%$root_prefix%g
|
|||
s%@GNUSTEP_LOCAL_ROOT@%$GNUSTEP_LOCAL_ROOT%g
|
||||
s%@GNUSTEP_NETWORK_ROOT@%$GNUSTEP_NETWORK_ROOT%g
|
||||
s%@GNUSTEP_FLATTENED@%$GNUSTEP_FLATTENED%g
|
||||
s%@BACKEND_BUNDLE@%$BACKEND_BUNDLE%g
|
||||
s%@CC@%$CC%g
|
||||
s%@CPP@%$CPP%g
|
||||
s%@host@%$host%g
|
||||
|
|
|
|||
27
configure.in
27
configure.in
|
|
@ -103,6 +103,21 @@ else
|
|||
fi
|
||||
AC_SUBST(GNUSTEP_FLATTENED)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Build backend bundles (on by default)
|
||||
#--------------------------------------------------------------------
|
||||
AC_ARG_ENABLE(backend-bundle,
|
||||
[ --disable-backend-bundle Compile gui backend as a library],
|
||||
ac_cv_backend=$enableval,
|
||||
ac_cv_backend="yes")
|
||||
|
||||
if test "$ac_cv_backend" = "yes"; then
|
||||
BACKEND_BUNDLE=yes;
|
||||
else
|
||||
BACKEND_BUNDLE=;
|
||||
fi
|
||||
AC_SUBST(BACKEND_BUNDLE)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Setup the library combination
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -117,7 +132,7 @@ AC_ARG_WITH(library-combo,[
|
|||
type 'make'. You can still change the library combination at runtime
|
||||
by specifying the 'library_combo' make variable. For example:
|
||||
|
||||
$ make library_combo=nx-pdo-nx-nil
|
||||
$ make library_combo=nx-pdo-nx
|
||||
],
|
||||
ac_cv_library_combo=$withval,
|
||||
ac_cv_library_combo=$ac_cv_library_combo
|
||||
|
|
@ -125,15 +140,9 @@ ac_cv_library_combo=$ac_cv_library_combo
|
|||
|
||||
if test "$ac_cv_library_combo" = ""; then
|
||||
if test $host_os = nextstep4; then
|
||||
ac_cv_library_combo=nx-nx-nx-nil
|
||||
elif test $host_os = cygwin; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
elif test $host_os = mingw32; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
elif test $host_os = mingw; then
|
||||
ac_cv_library_combo=gnu-gnu-gnu-win32
|
||||
ac_cv_library_combo=nx-nx-nx
|
||||
else
|
||||
ac_cv_library_combo=gnu-gnu-gnu-xgps
|
||||
ac_cv_library_combo=gnu-gnu-gnu
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(ac_cv_library_combo)
|
||||
|
|
|
|||
6
debian/changelog
vendored
6
debian/changelog
vendored
|
|
@ -1,3 +1,9 @@
|
|||
gnustep-make (1.0.0) unstable; urgency=low
|
||||
|
||||
* Change library-combo to gnu-gnu-gnu
|
||||
|
||||
-- Adam Fedor <fedor@gnu.org> Thu, 12 Apr 2001 18:47:57 +0600
|
||||
|
||||
gnustep-make (0.9.0-1) unstable; urgency=low
|
||||
|
||||
* Update to Debian policy 3.2.1.
|
||||
|
|
|
|||
2
debian/rules
vendored
2
debian/rules
vendored
|
|
@ -9,7 +9,7 @@ export DH_COMPAT=2
|
|||
pkg = gnustep-make
|
||||
tmpdir = $(shell pwd)/debian/$(pkg)
|
||||
prefix = usr/lib/GNUstep
|
||||
library_combo = gnu-gnu-gnu-xgps
|
||||
library_combo = gnu-gnu-gnu
|
||||
|
||||
build: stamp-build
|
||||
|
||||
|
|
|
|||
29
debugapp.in
29
debugapp.in
|
|
@ -44,10 +44,7 @@ case $1 in
|
|||
echo
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=gnu for GNUstep
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
echo
|
||||
echo application is the complete or relative name of the application
|
||||
|
|
@ -70,15 +67,11 @@ case $1 in
|
|||
esac
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
LIBRARY_COMBO=nx-nx-nx
|
||||
elif [ "$LIBRARY_COMBO" = gnu ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu
|
||||
elif [ "$LIBRARY_COMBO" = fd ]; then
|
||||
LIBRARY_COMBO=gnu-fd
|
||||
fi
|
||||
|
||||
# Remove leading slashes at the end of the application name
|
||||
|
|
@ -152,7 +145,7 @@ if [ -z "$GNUSTEP_FLATTENED" ]; then
|
|||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
|
|
@ -168,7 +161,7 @@ appname=`basename $appname`
|
|||
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
|
||||
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ ! -f $full_appname/$appname ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
|
|
@ -204,3 +197,9 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -75,15 +75,11 @@ do
|
|||
done
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xgps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xgps
|
||||
elif [ "$LIBRARY_COMBO" = fd-xgps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xgps
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
LIBRARY_COMBO=nx-nx-nx
|
||||
elif [ "$LIBRARY_COMBO" = gnu ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu
|
||||
elif [ "$LIBRARY_COMBO" = fd ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
|
||||
|
|
@ -197,7 +193,7 @@ if [ $show_full_path = 1 ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
%define gs_version @GNUSTEP_MAKE_VERSION@
|
||||
%define gs_name gnustep-make
|
||||
%define gs_prefix /usr/GNUstep
|
||||
%define gs_libcombo gnu-gnu-gnu-xgps
|
||||
%define gs_libcombo gnu-gnu-gnu
|
||||
#
|
||||
Name: %{gs_name}
|
||||
Version: %{gs_version}
|
||||
|
|
@ -20,22 +20,6 @@ Vendor: The GNUstep Project
|
|||
URL: http://www.gnustep.org/
|
||||
BuildRoot: /var/tmp/build-%{gs_name}
|
||||
#
|
||||
# NB: This package will be configured for use with:
|
||||
#
|
||||
# libxml.so.2 >= 2.2.3
|
||||
# openssl => 0.9.5
|
||||
# libwraster
|
||||
# libtiff
|
||||
# etc... <the ones available on the machine when the package is compiled>
|
||||
#
|
||||
# `Requires' lines for these packages will be automatically included
|
||||
# into gnustep-base gnustep-gui and gnustep-xgps - since these contain
|
||||
# tools, applications etc which are linked against those libraries.
|
||||
#
|
||||
# But it's very important that gnustep-base, gnustep-gui and
|
||||
# gnustep-xgps to be packaged at the same time/machine as this
|
||||
# gnustep-make, and so they must depend on this particular version of
|
||||
# gnustep-make.
|
||||
|
||||
%description
|
||||
This package contains the basic scripts, makefiles and directory layout
|
||||
|
|
@ -112,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 12 2001 Adam Fedor <fedor@gnu.org>
|
||||
- Changed default combo to gnu-gnu-gnu
|
||||
|
||||
* Mon Feb 19 2001 Nicola Pero <nicola@brainstorm.co.uk>
|
||||
- Updated for new special_prefix option
|
||||
|
||||
|
|
|
|||
126
openapp.in
126
openapp.in
|
|
@ -23,7 +23,7 @@
|
|||
# unmodified to the application.
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo usage: `basename $0` [--library-combo=...] application [arguments...]
|
||||
echo usage: `basename $0` application [--library-combo=...] [arguments...]
|
||||
echo `basename $0` --help for help
|
||||
exit 1
|
||||
fi
|
||||
|
|
@ -34,62 +34,22 @@ fi
|
|||
if [ -z "$EXEEXT" ]; then
|
||||
EXEEXT=@EXEEXT@
|
||||
fi
|
||||
if [ -z "$LIBRARY_COMBO" ]; then
|
||||
LIBRARY_COMBO=@ac_cv_library_combo@
|
||||
fi
|
||||
|
||||
# trap the --library-combo parameter
|
||||
case $1 in
|
||||
--help)
|
||||
echo usage: `basename $0` [--library-combo=...] application [arguments...]
|
||||
echo
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
else
|
||||
echo [--library-combo=...] is ignored for a flattened directory structure.
|
||||
fi
|
||||
echo usage: `basename $0` application [--library-combo=...] [arguments...]
|
||||
echo
|
||||
echo application is the complete or relative name of the application
|
||||
echo program with the .app extension, like Edit.app.
|
||||
echo program with the .app extension, like Ink.app.
|
||||
echo
|
||||
echo [arguments...] are the arguments to the application.
|
||||
echo [arguments...] are the arguments to the application.
|
||||
exit 0
|
||||
;;
|
||||
--library-combo=*)
|
||||
LIBRARY_COMBO=`echo $1 | sed 's/--library-combo=//'`
|
||||
if [ -z "$2" ]; then
|
||||
echo usage: `basename $0` [--library-combo=...] application [arguments...]
|
||||
echo `basename $0` --help for help
|
||||
exit 1
|
||||
fi
|
||||
app=$2; shift; shift
|
||||
;;
|
||||
*)
|
||||
app=$1; shift;;
|
||||
esac
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
fi
|
||||
|
||||
# Remove leading slashes at the end of the application name
|
||||
app=`echo $app | sed 's%/*$%%'`
|
||||
|
||||
|
|
@ -127,82 +87,14 @@ if [ -z "$full_appname" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_appname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_appname/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
|
||||
# get base app name
|
||||
appname=`echo $app | sed 's/\.[a-z]*$//'`
|
||||
appname=`basename $appname`
|
||||
|
||||
# Load up LD_LIBRARY_PATH
|
||||
# this needs to be PATH on NT
|
||||
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ ! -f $full_appname/$appname ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$appname "$@"
|
||||
|
||||
else
|
||||
# Determine if the application has a binary for this operating system
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS ]; then
|
||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ ! -d $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO ]; then
|
||||
echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname "$@"
|
||||
|
||||
fi
|
||||
else
|
||||
IFS=" "
|
||||
$full_appname/$appname "$@"
|
||||
if [ ! -f $full_appname/$appname ]; then
|
||||
echo "Could not find $full_appname executable/script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IFS=" "
|
||||
$full_appname/$appname $@
|
||||
145
opentool.in
145
opentool.in
|
|
@ -24,14 +24,11 @@
|
|||
# unmodified to the tool.
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
echo usage: `basename $0` [--library-combo=...] tool [arguments...]
|
||||
echo usage: `basename $0` tool [--library-combo=...] [arguments...]
|
||||
echo `basename $0` --help for help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
|
||||
fi
|
||||
if [ -z "$EXEEXT" ]; then
|
||||
EXEEXT=@EXEEXT@
|
||||
fi
|
||||
|
|
@ -39,95 +36,21 @@ fi
|
|||
# traps the parameters
|
||||
case $1 in
|
||||
--help)
|
||||
echo usage: `basename $0` [--library-combo=...] tool [arguments...]
|
||||
echo
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
echo [--library-combo=...] specifies a GNUstep backend to use.
|
||||
echo It overrides the default LIBRARY_COMBO environment variable.
|
||||
echo --library-combo=gnu-xdps for GNUstep XDPS Backend
|
||||
echo --library-combo=gnu-xraw for GNUstep XRaw Backend
|
||||
echo --library-combo=fd-xraw for GNUstep XRaw Backend with libFoundation
|
||||
echo --library-combo=fd-xdps for GNUstep XDPS Backend with libFoundation
|
||||
echo --library-combo=nx for NeXT OPENSTEP
|
||||
else
|
||||
echo [--library-combo=...] is ignored for a flattened directory structure.
|
||||
fi
|
||||
echo
|
||||
echo usage: `basename $0` tool [--library-combo=...] [arguments...]
|
||||
echo tool is the complete or relative name of the tool executable
|
||||
echo without any extension, like dread.
|
||||
echo
|
||||
echo [arguments...] are the arguments to the tool.
|
||||
exit 0
|
||||
;;
|
||||
--library-combo=*)
|
||||
LIBRARY_COMBO=`echo $1 | sed 's/--library-combo=//'`
|
||||
if [ -z "$2" ]; then
|
||||
echo usage: `basename $0` [--library-combo=...] tool [arguments...]
|
||||
echo `basename $0` --help for help
|
||||
exit 1
|
||||
fi
|
||||
tool=$2; shift; shift
|
||||
;;
|
||||
*)
|
||||
tool=$1; shift;;
|
||||
esac
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
# TODO: these defaults need to be output to the user
|
||||
if [ "$LIBRARY_COMBO" = nx ]; then
|
||||
LIBRARY_COMBO=nx-nx-nx-nil
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xdps
|
||||
elif [ "$LIBRARY_COMBO" = gnu-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-gnu-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xraw ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xraw
|
||||
elif [ "$LIBRARY_COMBO" = fd-xdps ]; then
|
||||
LIBRARY_COMBO=gnu-fd-gnu-xdps
|
||||
fi
|
||||
export LIBRARY_COMBO
|
||||
fi
|
||||
|
||||
if [ -z "$EXEEXT" ]; then
|
||||
tool=$tool$EXEEXT
|
||||
fi
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
#
|
||||
# Determine the host information
|
||||
#
|
||||
if [ -z "$GNUSTEP_HOST" ]; then
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
|
||||
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.sub $GNUSTEP_HOST)`
|
||||
export GNUSTEP_HOST
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_CPU" ]; then
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/cpu.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_CPU=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $GNUSTEP_HOST_CPU`
|
||||
export GNUSTEP_HOST_CPU
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_VENDOR" ]; then
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/vendor.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_VENDOR=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_vendor.sh $GNUSTEP_HOST_VENDOR`
|
||||
export GNUSTEP_HOST_VENDOR
|
||||
fi
|
||||
if [ -z "$GNUSTEP_HOST_OS" ]; then
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/os.sh $GNUSTEP_HOST`
|
||||
GNUSTEP_HOST_OS=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $GNUSTEP_HOST_OS`
|
||||
export GNUSTEP_HOST_OS
|
||||
fi
|
||||
|
||||
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||
if [ -f "$full_toolname/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/library_paths.openapp`"
|
||||
fi
|
||||
else
|
||||
if [ -f "$full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
|
||||
additional_library_paths="`cat $full_toolname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
case $tool in
|
||||
/*) # An absolute path.
|
||||
full_toolname=$tool;;
|
||||
|
|
@ -138,44 +61,30 @@ case $tool in
|
|||
full_toolname=${tool_dir}/${tool_name};;
|
||||
*) # A path that should be searched into GNUstep tool paths
|
||||
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
GNUSTEP_HOST_DIR=$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
|
||||
GNUSTEP_HOST_LDIR=$GNUSTEP_HOST_DIR/$LIBRARY_COMBO
|
||||
|
||||
# search for a local one
|
||||
for file in */$GNUSTEP_HOST_LDIR/$tool; do
|
||||
if [ -x $file ]; then
|
||||
full_toolname=$file;
|
||||
break;
|
||||
fi
|
||||
done
|
||||
# Only search further if we found no local one
|
||||
if [ -z "$full_toolname" ]; then
|
||||
SPATH=:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_DIR
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_LDIR
|
||||
SPATH=$SPATH:$PATH
|
||||
fi
|
||||
else
|
||||
SPATH=:$GNUSTEP_USER_ROOT/Tools
|
||||
SPATH=$SPATH:$GNUSTEP_LOCAL_ROOT/Tools
|
||||
SPATH=$SPATH:$GNUSTEP_SYSTEM_ROOT/Tools
|
||||
SPATH=$SPATH:$PATH
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
# search for a local one
|
||||
for file in */$GNUSTEP_HOST_LDIR/$tool; do
|
||||
if [ -x $file ]; then
|
||||
full_toolname=$file;
|
||||
break;
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Only search further if we found no local one
|
||||
if [ -z "$full_toolname" ]; then
|
||||
IFS=:
|
||||
for dir in $SPATH; do
|
||||
if [ -x $dir/$tool ]; then
|
||||
full_toolname=$dir/$tool;
|
||||
break;
|
||||
fi
|
||||
done;
|
||||
fi;;
|
||||
if [ -n $GNUSTEP_PATHPREFIX_LIST ]; then
|
||||
SPATH=$GNUSTEP_PATHPREFIX_LIST
|
||||
else
|
||||
SPATH=$PATH
|
||||
fi
|
||||
SPATH=.:$SPATH
|
||||
IFS=:
|
||||
for dir in $SPATH; do
|
||||
if [ -x $dir/Tools/$tool ]; then
|
||||
full_toolname=$dir/Tools/$tool
|
||||
break;
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ -z "$full_toolname" ]; then
|
||||
|
|
@ -183,9 +92,5 @@ if [ -z "$full_toolname" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Load up LD_LIBRARY_PATH
|
||||
# this needs to be PATH on NT
|
||||
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh
|
||||
|
||||
IFS=" "
|
||||
$full_toolname "$@"
|
||||
exec $full_toolname "$@"
|
||||
|
|
|
|||
Loading…
Reference in a new issue