From 54ecc3d24f52ae45ca54a24167e434915c88b60f Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 27 Jan 1999 17:53:11 +0000 Subject: Patches by William Lewis for Nextstep descendants. --- Makefile.in | 12 +- Modules/Makefile.pre.in | 4 +- Modules/getbuildinfo.c | 4 +- Modules/getpath.c | 26 +- Modules/posixmodule.c | 119 ++++++++-- Modules/readline.c | 1 + Python/getversion.c | 4 +- Python/importdl.c | 75 +++++- Python/strdup.c | 6 +- acconfig.h | 12 + config.h.in | 18 +- configure | 620 ++++++++++++++++++++++++++++-------------------- configure.in | 116 +++++++-- 13 files changed, 689 insertions(+), 328 deletions(-) diff --git a/Makefile.in b/Makefile.in index d79f8f6..552f835 100644 --- a/Makefile.in +++ b/Makefile.in @@ -161,6 +161,7 @@ DIST= $(DISTFILES) $(DISTDIRS) CFLAGS= $(OPT) -I. $(DEFS) LIBRARY= libpython$(VERSION).a +LDLIBRARY= @LDLIBRARY@ # Default target all: $(LIBRARY) python sharedmods @@ -173,10 +174,10 @@ python: $(LIBRARY) buildno Modules/python.o $(srcdir)/Modules/getbuildinfo.c $(AR) cr $(LIBRARY) getbuildinfo.o $(RANLIB) $(LIBRARY) - @DGUX_IS_BROKEN@ + @MAKE_LDLIBRARY@ cd Modules; $(MAKE) OPT="$(OPT)" VERSION="$(VERSION)" \ prefix="$(prefix)" exec_prefix="$(exec_prefix)" \ - LIBRARY=../$(LIBRARY) link + LIBRARY=../$(LDLIBRARY) link Modules/python.o: $(srcdir)/Modules/python.c cd Modules; $(MAKE) OPT="$(OPT)" python.o @@ -204,6 +205,10 @@ libpython$(VERSION).so: $(LIBRARY) (cd dgux;ar x ../$^;ld -G -o ../$@ * ) /bin/rm -rf ./dgux +# This rule is here for OPENSTEP/Rhapsody/MacOSX +libpython$(VERSION).dylib: $(LIBRARY) + libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) -framework System @LIBTOOL_CRUFT@ + $(SUBDIRS): Makefiles Parser: @@ -258,7 +263,6 @@ altbininstall: python fi; \ done $(INSTALL_PROGRAM) python$(EXE) $(BINDIR)/python$(VERSION)$(EXE) - @DGUX_IS_BROKEN@ if test -f libpython$(VERSION).so; then \ $(INSTALL_DATA) libpython$(VERSION).so $(LIBDIR); \ else true; \ @@ -504,7 +508,7 @@ clean: localclean done localclobber: localclean - -rm -f tags TAGS python $(LIBRARY) *.o + -rm -f tags TAGS python $(LIBRARY) $(LDLIBRARY) *.o -rm -f config.log config.cache config.h clobber: localclobber diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index 4d306e7..4ea78c5 100644 --- a/Modules/Makefile.pre.in +++ b/Modules/Makefile.pre.in @@ -100,7 +100,7 @@ MAINOBJ= python.o SYSLIBS= $(LIBM) $(LIBC) LIBRARY= ../libpython$(VERSION).a -REALLIBRARY= ../@REALLIBRARY@ +LDLIBRARY= ../@LDLIBRARY@ # === Rules === @@ -123,7 +123,7 @@ EXE= # This target is used by the master Makefile to link the final binary. link: $(MAINOBJ) $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) $(MAINOBJ) \ - $(LIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST) + $(LDLIBRARY) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python $(LDLAST) mv python$(EXE) ../python$(EXE) clean: diff --git a/Modules/getbuildinfo.c b/Modules/getbuildinfo.c index 3f9ee52..49793b8 100644 --- a/Modules/getbuildinfo.c +++ b/Modules/getbuildinfo.c @@ -30,7 +30,7 @@ const char * Py_GetBuildInfo() { - static char buildinfo[40]; - sprintf(buildinfo, "#%d, %.12s, %.8s", BUILD, DATE, TIME); + static char buildinfo[50]; + sprintf(buildinfo, "#%d, %.20s, %.9s", BUILD, DATE, TIME); return buildinfo; } diff --git a/Modules/getpath.c b/Modules/getpath.c index 09b795d..78b4915 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -42,6 +42,10 @@ PERFORMANCE OF THIS SOFTWARE. #include #endif /* HAVE_UNISTD_H */ +#ifdef WITH_NEXT_FRAMEWORK +#include +#endif + /* Search in some common locations for the associated Python libraries. * * Two directories must be found, the platform independent directory @@ -394,7 +398,24 @@ calculate_path() int bufsz; int prefixsz; char *defpath = pythonpath; - +#ifdef WITH_NEXT_FRAMEWORK + NSModule pythonModule; +#endif + +#ifdef WITH_NEXT_FRAMEWORK + pythonModule = NSModuleForSymbol(NSLookupAndBindSymbol("_Py_Initialize")); + /* Use dylib functions to find out where the framework was loaded from */ + buf = NSLibraryNameForModule(pythonModule); + if (buf != NULL) { + /* We're in a framework. */ + strcpy(progpath, buf); + + /* Frameworks have support for versioning */ + strcpy(lib_python, "lib"); + } else { + /* If we're not in a framework, fall back to the old way (even though NSNameOfModule() probably does the same thing.) */ +#endif + /* Initialize this dynamically for K&R C */ sprintf(lib_python, "lib/python%s", VERSION); @@ -430,6 +451,9 @@ calculate_path() } else progpath[0] = '\0'; +#ifdef WITH_NEXT_FRAMEWORK + } +#endif strcpy(argv0_path, progpath); diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 8ac5d96..19c7809 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -146,6 +146,7 @@ corresponding Unix manual entries for more information on calls."; #undef HAVE_UTIME_H #define HAVE_WAITPID /* #undef HAVE_GETCWD */ +#define UNION_WAIT /* This should really be checked for by autoconf */ #endif #ifdef HAVE_UNISTD_H @@ -255,6 +256,23 @@ extern int lstat Py_PROTO((const char *, struct stat *)); #include #endif /* OS2 */ +#ifdef UNION_WAIT +/* Emulate some macros on systems that have a union instead of macros */ + +#ifndef WIFEXITED +#define WIFEXITED(u_wait) (!(u_wait).w_termsig && !(u_wait).w_coredump) +#endif + +#ifndef WEXITSTATUS +#define WEXITSTATUS(u_wait) (WIFEXITED(u_wait)?((u_wait).w_retcode):-1) +#endif + +#ifndef WTERMSIG +#define WTERMSIG(u_wait) ((u_wait).w_termsig) +#endif + +#endif /* UNION_WAIT */ + /* Return a dictionary corresponding to the POSIX environment table */ #if !defined(_MSC_VER) && ( !defined(__WATCOMC__) || defined(__QNX__) ) @@ -1986,20 +2004,25 @@ posix_waitpid(self, args) PyObject *self; PyObject *args; { - int pid, options, sts = 0; + int pid, options; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; + if (!PyArg_Parse(args, "(ii)", &pid, &options)) return NULL; Py_BEGIN_ALLOW_THREADS -#ifdef NeXT - pid = wait4(pid, (union wait *)&sts, options, NULL); -#else - pid = waitpid(pid, &sts, options); -#endif + pid = wait4(pid, &status, options, NULL); Py_END_ALLOW_THREADS if (pid == -1) return posix_error(); else - return Py_BuildValue("ii", pid, sts); + return Py_BuildValue("ii", pid, status_i); } #endif /* HAVE_WAITPID */ @@ -2015,17 +2038,21 @@ posix_wait(self, args) PyObject *args; { int pid, sts; - Py_BEGIN_ALLOW_THREADS -#ifdef NeXT - pid = wait((union wait *)&sts); +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) #else - pid = wait(&sts); + int status; +#define status_i status #endif + status_i = 0; + Py_BEGIN_ALLOW_THREADS + pid = wait(&status); Py_END_ALLOW_THREADS if (pid == -1) return posix_error(); else - return Py_BuildValue("ii", pid, sts); + return Py_BuildValue("ii", pid, status_i); } #endif @@ -2821,9 +2848,16 @@ posix_WIFSTOPPED(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } @@ -2842,9 +2876,16 @@ posix_WIFSIGNALED(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } @@ -2863,9 +2904,16 @@ posix_WIFEXITED(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } @@ -2874,7 +2922,7 @@ posix_WIFEXITED(self, args) } #endif /* WIFEXITED */ -#ifdef WIFSTOPPED +#ifdef WEXITSTATUS static char posix_WEXITSTATUS__doc__[] = "WEXITSTATUS(status) -> integer\n\ See Unix documentation."; @@ -2884,9 +2932,16 @@ posix_WEXITSTATUS(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } @@ -2905,9 +2960,16 @@ posix_WTERMSIG(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } @@ -2926,9 +2988,16 @@ posix_WSTOPSIG(self, args) PyObject *self; PyObject *args; { - int status = 0; +#ifdef UNION_WAIT + union wait status; +#define status_i (status.w_status) +#else + int status; +#define status_i status +#endif + status_i = 0; - if (!PyArg_Parse(args, "i", &status)) + if (!PyArg_Parse(args, "i", &status_i)) { return NULL; } diff --git a/Modules/readline.c b/Modules/readline.c index 08569f6..608dd88 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -34,6 +34,7 @@ extern int rl_bind_key(); extern int rl_bind_key_in_map(); extern int rl_initialize(); extern int add_history(); +extern Function *rl_event_hook; #endif /* Pointers needed from outside (but not declared in a header file). */ diff --git a/Python/getversion.c b/Python/getversion.c index ead8e77..9f57d6e 100644 --- a/Python/getversion.c +++ b/Python/getversion.c @@ -38,8 +38,8 @@ PERFORMANCE OF THIS SOFTWARE. const char * Py_GetVersion() { - static char version[80]; - sprintf(version, "%.10s (%.30s) %.30s", PY_VERSION, + static char version[100]; + sprintf(version, "%.10s (%.40s) %.40s", PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler()); return version; } diff --git a/Python/importdl.c b/Python/importdl.c index 073e23f..3b43bbc 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -46,7 +46,8 @@ PERFORMANCE OF THIS SOFTWARE. symbol -- defined for: DYNAMIC_LINK -- any kind of dynamic linking - USE_RLD -- NeXT dynamic linking + USE_RLD -- NeXT dynamic linking with FVM shlibs + USE_DYLD -- NeXT dynamic linking with frameworks USE_DL -- Jack's dl for IRIX 4 or GNU dld with emulation for Jack's dl USE_SHLIB -- SunOS or IRIX 5 (SVR4?) shared libraries _AIX -- AIX style dynamic linking @@ -117,7 +118,15 @@ typedef FARPROC dl_funcptr; #endif #endif -#ifdef NeXT +#ifdef WITH_DYLD +#define DYNAMIC_LINK +#define USE_DYLD +#define SHORT_EXT ".so" +#define LONG_EXT "module.so" +#define FUNCNAME_PATTERN "_init%.200s" +#endif + +#if defined(NeXT) && !defined(DYNAMIC_LINK) #define DYNAMIC_LINK #define USE_RLD /* Define this to 1 if you want be able to load ObjC modules as well: @@ -251,16 +260,22 @@ typedef void (*dl_funcptr)(); #ifdef USE_RLD #include -#define FUNCNAME_PATTERN "_init%.200s" #ifndef _DL_FUNCPTR_DEFINED typedef void (*dl_funcptr)(); #endif #endif /* USE_RLD */ +#ifdef USE_DYLD +#include +#ifndef _DL_FUNCPTR_DEFINED +typedef void (*dl_funcptr)(); +#endif +#endif /* USE_DYLD */ + extern char *Py_GetProgramName(); #ifndef FUNCNAME_PATTERN -#if defined(__hp9000s300) || (defined(__NetBSD__) || defined(__FreeBSD__)) && !defined(__ELF__) || defined(__OpenBSD__) || defined(__BORLANDC__) +#if defined(__hp9000s300) || (defined(__NetBSD__) || defined(__FreeBSD__)) && !defined(__ELF__) || defined(__OpenBSD__) || defined(__BORLANDC__) || defined(NeXT) #define FUNCNAME_PATTERN "_init%.200s" #else #define FUNCNAME_PATTERN "init%.200s" @@ -653,6 +668,58 @@ _PyImport_LoadDynamicModule(name, pathname, fp) return NULL; } #endif /* USE_RLD */ +#ifdef USE_DYLD + /* This is also NeXT-specific. However, frameworks (the new style + of shared library) and rld() can't be used in the same program; + instead, you have to use dyld, which is mostly unimplemented. */ + { + NSObjectFileImageReturnCode rc; + NSObjectFileImage image; + NSModule newModule; + NSSymbol theSym; + void *symaddr; + const char *errString; + + rc = NSCreateObjectFileImageFromFile(pathname, &image); + switch(rc) { + default: + case NSObjectFileImageFailure: + NSObjectFileImageFormat: + /* for these a message is printed on stderr by dyld */ + errString = "Can't create object file image"; + break; + case NSObjectFileImageSuccess: + errString = NULL; + break; + case NSObjectFileImageInappropriateFile: + errString = "Inappropriate file type for dynamic loading"; + break; + case NSObjectFileImageArch: + errString = "Wrong CPU type in object file"; + break; + NSObjectFileImageAccess: + errString = "Can't read object file (no access)"; + break; + } + if (errString == NULL) { + newModule = NSLinkModule(image, pathname, TRUE); + if (!newModule) + errString = "Failure linking new module"; + } + if (errString != NULL) { + PyErr_SetString(PyExc_ImportError, errString); + return NULL; + } + if (!NSIsSymbolNameDefined(funcname)) { + /* UnlinkModule() isn't implimented in current versions, but calling it does no harm */ + NSUnLinkModule(newModule, FALSE); + PyErr_Format(PyExc_ImportError, "Loaded module does not contain symbol %s", funcname); + return NULL; + } + theSym = NSLookupAndBindSymbol(funcname); + p = (dl_funcptr)NSAddressOfSymbol(theSym); + } +#endif /* USE_DYLD */ #ifdef hpux { shl_t lib; diff --git a/Python/strdup.c b/Python/strdup.c index d21a0bc..9168b4f 100644 --- a/Python/strdup.c +++ b/Python/strdup.c @@ -1,10 +1,6 @@ /* strdup() replacement (from stdwin, if you must know) */ -#include "config.h" -#include "myproto.h" -#include "mymalloc.h" - -#include +#include "pgenheaders.h" char * strdup(str) diff --git a/acconfig.h b/acconfig.h index 27c7b17..55c3db7 100644 --- a/acconfig.h +++ b/acconfig.h @@ -18,6 +18,9 @@ /* Define to `long' if doesn't define. */ #undef clock_t +/* Used for BeOS configuration */ +#undef DL_EXPORT_HEADER + /* Define if getpgrp() must be called as getpgrp(0). */ #undef GETPGRP_HAVE_ARG @@ -93,9 +96,18 @@ shared libraries */ #undef WITH_DL_DLD +/* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) + dynamic linker (dyld) instead of the old-style (NextStep) dynamic + linker (rld). Dyld is necessary to support frameworks. */ +#undef WITH_DYLD + /* Define if you want to compile in rudimentary thread support */ #undef WITH_THREAD +/* Define if you want to produce an OpenStep/Rhapsody framework + (shared library plus accessory files). */ +#undef WITH_NEXT_FRAMEWORK + /* The number of bytes in an off_t. */ #undef SIZEOF_OFF_T diff --git a/config.h.in b/config.h.in index 6b87e69..03a7fb0 100644 --- a/config.h.in +++ b/config.h.in @@ -79,6 +79,9 @@ /* Define to `long' if doesn't define. */ #undef clock_t +/* Used for BeOS configuration */ +#undef DL_EXPORT_HEADER + /* Define if getpgrp() must be called as getpgrp(0). */ #undef GETPGRP_HAVE_ARG @@ -148,9 +151,18 @@ shared libraries */ #undef WITH_DL_DLD +/* Define if you want to use the new-style (Openstep, Rhapsody, MacOS) + dynamic linker (dyld) instead of the old-style (NextStep) dynamic + linker (rld). Dyld is necessary to support frameworks. */ +#undef WITH_DYLD + /* Define if you want to compile in rudimentary thread support */ #undef WITH_THREAD +/* Define if you want to produce an OpenStep/Rhapsody framework + (shared library plus accessory files). */ +#undef WITH_NEXT_FRAMEWORK + /* The number of bytes in an off_t. */ #undef SIZEOF_OFF_T @@ -453,9 +465,3 @@ /* Define if you have the m library (-lm). */ #undef HAVE_LIBM - -/* Define if you have special dynamic linkage requirements in declarations. */ -#undef DL_EXPORT_HEADER -#ifdef DL_EXPORT_HEADER -#include DL_EXPORT_HEADER -#endif diff --git a/configure b/configure index f186070..3ab7be8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.95 +# From configure.in Revision: 1.96 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -16,6 +16,10 @@ ac_default_prefix=/usr/local ac_help="$ac_help --with-next-archs='arch1 arch2 ..' build MAB binary" ac_help="$ac_help +--with-next-framework Build (OpenStep|Rhapsody|MacOS10) framework" +ac_help="$ac_help +--with-dyld Use (OpenStep|Rhapsody|MacOS10) dynamic linker" +ac_help="$ac_help --without-gcc never use gcc" ac_help="$ac_help --with-libs='lib1 ...' link against additional libs" @@ -554,10 +558,10 @@ fi VERSION=1.5 # NEXTSTEP stuff -if test -f /usr/lib/NextStep/software_version; then +if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices/software_version ; then echo $ac_n "checking for --with-next-archs""... $ac_c" 1>&6 -echo "configure:561: checking for --with-next-archs" >&5 +echo "configure:565: checking for --with-next-archs" >&5 # Check whether --with-next-archs or --without-next-archs was given. if test "${with_next_archs+set}" = set; then withval="$with_next_archs" @@ -576,7 +580,7 @@ fi if test -z "$MACHDEP" then - set X `hostinfo | grep 'NeXT Mach.*:' | \ + set X `hostinfo | egrep '(NeXT Mach|Kernel Release).*:' | \ sed -e 's/://' -e 's/\./_/'` && \ ac_sys_system=next && ac_sys_release=$4 @@ -584,11 +588,23 @@ fi fi fi +# Check whether --with-next-framework or --without-next-framework was given. +if test "${with_next_framework+set}" = set; then + withval="$with_next_framework" + : +fi + +# Check whether --with-dyld or --without-dyld was given. +if test "${with_dyld+set}" = set; then + withval="$with_dyld" + : +fi + # Set name for machine-dependent library files echo $ac_n "checking MACHDEP""... $ac_c" 1>&6 -echo "configure:592: checking MACHDEP" >&5 +echo "configure:608: checking MACHDEP" >&5 if test -z "$MACHDEP" then ac_sys_system=`uname -s` @@ -633,7 +649,7 @@ echo "$ac_t""$MACHDEP" 1>&6 # echo $ac_n "checking CCC""... $ac_c" 1>&6 -echo "configure:637: checking CCC" >&5 +echo "configure:653: checking CCC" >&5 if test -z "$CCC" then case $ac_sys_system in @@ -649,7 +665,7 @@ echo "$ac_t""$SET_CCC" 1>&6 # checks for alternative programs echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 -echo "configure:653: checking for --without-gcc" >&5 +echo "configure:669: checking for --without-gcc" >&5 # Check whether --with-gcc or --without-gcc was given. if test "${with_gcc+set}" = set; then withval="$with_gcc" @@ -723,7 +739,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:727: checking for $ac_word" >&5 +echo "configure:743: 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 @@ -753,7 +769,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:757: checking for $ac_word" >&5 +echo "configure:773: 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 @@ -804,7 +820,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:808: checking for $ac_word" >&5 +echo "configure:824: 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 @@ -836,7 +852,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:840: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:856: 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. @@ -847,12 +863,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 851 "configure" +#line 867 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:872: \"$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 @@ -878,12 +894,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:882: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:898: 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:887: checking whether we are using GNU C" >&5 +echo "configure:903: 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 @@ -892,7 +908,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:896: \"$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:912: \"$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 @@ -911,7 +927,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:915: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:931: 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 @@ -961,12 +977,20 @@ BeOS*) esac;; esac +# LDLIBRARY is the name of the library to link against (as opposed to the +# name of the library into which to insert object files). On systems +# without shared libraries, LDLIBRARY is the same as LIBRARY (defined in +# the Makefiles). + + +LDLIBRARY='' + # LINKCC is the command that links the python executable -- default is $(CC). # This is altered for AIX and BeOS in order to build the export list before # linking. echo $ac_n "checking LINKCC""... $ac_c" 1>&6 -echo "configure:970: checking LINKCC" >&5 +echo "configure:994: checking LINKCC" >&5 if test -z "$LINKCC" then case $ac_sys_system in @@ -974,7 +998,7 @@ then LINKCC="\$(srcdir)/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";; BeOS*) LINKCC="\$(srcdir)/../BeOS/linkcc \$(LIBRARY) \$(PURIFY) \$(CC) \$(OPT)" - REALLIBRARY='libpython$(VERSION).so';; + LDLIBRARY='libpython$(VERSION).so';; dgux*) LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";; *) LINKCC="\$(PURIFY) \$(CC)";; @@ -982,10 +1006,37 @@ then fi echo "$ac_t""$LINKCC" 1>&6 +echo $ac_n "checking LDLIBRARY""... $ac_c" 1>&6 +echo "configure:1011: checking LDLIBRARY" >&5 + +# NeXT framework builds require that the 'ar' library be converted into +# a bundle using libtool. +if test "$with_next_framework" +then + LDLIBRARY='libpython$(VERSION).dylib' +fi + +# DG/UX requires some fancy ld contortions to produce a .so from an .a +if test "$MACHDEP" = "dguxR4" +then + LDLIBRARY='libpython$(VERSION).so' + OPT="$OPT -pic" +fi +echo "$ac_t""$LDLIBRARY" 1>&6 + +# If LDLIBRARY is different from LIBRARY, emit a rule to build it. +if test -z "$LDLIBRARY" +then + LDLIBRARY='libpython$(VERSION).a' + MAKE_LDLIBRARY="true" +else + MAKE_LDLIBRARY='$(MAKE) $(LDLIBRARY)' +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:989: checking for $ac_word" >&5 +echo "configure:1040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1018,7 +1069,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:1022: checking for $ac_word" >&5 +echo "configure:1073: 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 @@ -1051,7 +1102,6 @@ test -n "$AR" || AR="ar" - # Install just never works :-( if test -z "$INSTALL" then @@ -1093,7 +1143,7 @@ then fi # checks for UNIX variants that set C preprocessor variables echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1097: checking how to run the C preprocessor" >&5 +echo "configure:1147: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1108,13 +1158,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error 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:1168: \"$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 : @@ -1125,13 +1175,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1185: \"$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 : @@ -1142,13 +1192,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1202: \"$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 : @@ -1173,9 +1223,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1177: checking for AIX" >&5 +echo "configure:1227: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1202: checking for minix/config.h" >&5 +echo "configure:1252: checking for minix/config.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1247,7 +1297,7 @@ fi echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6 -echo "configure:1251: checking whether $CC accepts -OPT:Olimit=0" >&5 +echo "configure:1301: checking whether $CC accepts -OPT:Olimit=0" >&5 if eval "test \"`echo '$''{'ac_cv_opt_olimit_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1257,11 +1307,11 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_opt_olimit_ok=yes else @@ -1281,7 +1331,7 @@ if test $ac_cv_opt_olimit_ok = yes; then OPT="$OPT -OPT:Olimit=0" else echo $ac_n "checking whether $CC accepts -Olimit 1500""... $ac_c" 1>&6 -echo "configure:1285: checking whether $CC accepts -Olimit 1500" >&5 +echo "configure:1335: checking whether $CC accepts -Olimit 1500" >&5 if eval "test \"`echo '$''{'ac_cv_olimit_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1291,11 +1341,11 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_olimit_ok=yes else @@ -1316,22 +1366,11 @@ fi fi fi - -if test "$MACHDEP" != "dguxR4" -then - REALLIBRARY='libpython$(VERSION).a' - DGUX_IS_BROKEN="true" -else - REALLIBRARY='libpython$(VERSION).so' - OPT="$OPT -pic" - DGUX_IS_BROKEN="make $REALLIBRARY" -fi - # check for ANSI or K&R ("traditional") preprocessor echo $ac_n "checking for C preprocessor type""... $ac_c" 1>&6 -echo "configure:1333: checking for C preprocessor type" >&5 +echo "configure:1372: checking for C preprocessor type" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cpp_type=ansi else @@ -1359,12 +1398,12 @@ echo "$ac_t""$cpp_type" 1>&6 # checks for header files echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1363: checking for ANSI C header files" >&5 +echo "configure:1402: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1372,7 +1411,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1415: \"$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* @@ -1389,7 +1428,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1407,7 +1446,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1428,7 +1467,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1439,7 +1478,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1470,17 +1509,17 @@ sys/un.h sys/utsname.h sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1474: checking for $ac_hdr" >&5 +echo "configure:1513: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1523: \"$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* @@ -1511,12 +1550,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:1515: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1554: 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 < #include <$ac_hdr> @@ -1524,7 +1563,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1549,7 +1588,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:1553: checking for opendir in -ldir" >&5 +echo "configure:1592: 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 @@ -1557,7 +1596,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1611: \"$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 @@ -1590,7 +1629,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1594: checking for opendir in -lx" >&5 +echo "configure:1633: 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 @@ -1598,7 +1637,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1652: \"$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 @@ -1635,9 +1674,9 @@ fi # checks for typedefs was_it_defined=no echo $ac_n "checking for clock_t in time.h""... $ac_c" 1>&6 -echo "configure:1639: checking for clock_t in time.h" >&5 +echo "configure:1678: checking for clock_t in time.h" >&5 cat > conftest.$ac_ext < EOF @@ -1664,12 +1703,12 @@ cat >> confdefs.h <<\EOF EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1668: checking for mode_t" >&5 +echo "configure:1707: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1697,12 +1736,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1701: checking for off_t" >&5 +echo "configure:1740: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1730,12 +1769,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1734: checking for pid_t" >&5 +echo "configure:1773: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1763,12 +1802,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1767: checking return type of signal handlers" >&5 +echo "configure:1806: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1785,7 +1824,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1804,12 +1843,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1808: checking for size_t" >&5 +echo "configure:1847: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1837,12 +1876,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1841: checking for uid_t in sys/types.h" >&5 +echo "configure:1880: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1872,7 +1911,7 @@ fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1876: checking size of int" >&5 +echo "configure:1915: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1880,7 +1919,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1891,7 +1930,7 @@ main() exit(0); } EOF -if { (eval echo configure:1895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1911,7 +1950,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1915: checking size of long" >&5 +echo "configure:1954: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1919,7 +1958,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1930,7 +1969,7 @@ main() exit(0); } EOF -if { (eval echo configure:1934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1950,7 +1989,7 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:1954: checking size of void *" >&5 +echo "configure:1993: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1958,7 +1997,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1969,7 +2008,7 @@ main() exit(0); } EOF -if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_void_p=`cat conftestval` else @@ -1990,17 +2029,17 @@ EOF echo $ac_n "checking for long long support""... $ac_c" 1>&6 -echo "configure:1994: checking for long long support" >&5 +echo "configure:2033: checking for long long support" >&5 have_long_long=no cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LONG_LONG 1 @@ -2014,7 +2053,7 @@ rm -f conftest* echo "$ac_t""$have_long_long" 1>&6 if test $have_long_long = yes ; then echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2018: checking size of long long" >&5 +echo "configure:2057: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2022,7 +2061,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -2033,7 +2072,7 @@ main() exit(0); } EOF -if { (eval echo configure:2037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2056,7 +2095,7 @@ fi # Hmph. AC_CHECK_SIZEOF() doesn't include . echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2060: checking size of off_t" >&5 +echo "configure:2099: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2064,7 +2103,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -2076,7 +2115,7 @@ main() exit(0); } EOF -if { (eval echo configure:2080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -2098,7 +2137,7 @@ EOF echo $ac_n "checking whether to enable large file support""... $ac_c" 1>&6 -echo "configure:2102: checking whether to enable large file support" >&5 +echo "configure:2141: checking whether to enable large file support" >&5 if test $have_long_long = yes -a \ $ac_cv_sizeof_off_t -gt $ac_cv_sizeof_long -a \ $ac_cv_sizeof_long_long -ge $ac_cv_sizeof_off_t; then @@ -2112,6 +2151,53 @@ else fi +# Minor variations in building a framework between NextStep versions 4 and 5 + +case $ac_sys_system/$ac_sys_release in + next/4*) + ns_undef_sym='__environ' + LIBTOOL_CRUFT="-U $ns_undef_sym" ;; + next/5*) + ns_undef_sym='_environ' + LIBTOOL_CRUFT="-lcc_dynamic -U $ns_undef_sym" ;; +esac + +echo $ac_n "checking for --with-next-framework""... $ac_c" 1>&6 +echo "configure:2167: checking for --with-next-framework" >&5 +if test "$with_next_framework" +then + OPT="$OPT -fno-common" + # -U __environ is needed since bundles don't have access + # to crt0 when built but will always be linked against it + LDFLAGS="$LDFLAGS -Wl,-U,$ns_undef_sym" + cat >> confdefs.h <<\EOF +#define WITH_NEXT_FRAMEWORK 1 +EOF + + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +echo $ac_n "checking for --with-dyld""... $ac_c" 1>&6 +echo "configure:2184: checking for --with-dyld" >&5 +if test "$with_next_framework" -o "$with_dyld" +then + if test "$with_dyld" + then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""required for framework build" 1>&6 + fi + cat >> confdefs.h <<\EOF +#define WITH_DYLD 1 +EOF + + ns_dyld='set' +else + echo "$ac_t""no" 1>&6 +fi + # Set info about shared libraries. @@ -2120,7 +2206,7 @@ fi # SO is the extension of shared libraries `(including the dot!) # -- usually .so, .sl on HP-UX echo $ac_n "checking SO""... $ac_c" 1>&6 -echo "configure:2124: checking SO" >&5 +echo "configure:2210: checking SO" >&5 if test -z "$SO" then case $ac_sys_system in @@ -2131,8 +2217,10 @@ fi echo "$ac_t""$SO" 1>&6 # LDSHARED is the ld *command* used to create shared library # -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5 +# (Shared libraries in this instance are shared modules to be loaded into +# Python, as opposed to building Python itself as a shared library.) echo $ac_n "checking LDSHARED""... $ac_c" 1>&6 -echo "configure:2136: checking LDSHARED" >&5 +echo "configure:2224: checking LDSHARED" >&5 if test -z "$LDSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2145,7 +2233,14 @@ then hp*|HP*) LDSHARED="ld -b";; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; DYNIX/ptx*) LDSHARED="ld -G";; - next/*) LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';; + next/*) + if test "$ns_dyld" + then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind' + else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r'; + fi + if test "$with_next_framework" ; then + LDSHARED="$LDSHARED \$(LDLIBRARY)" + fi ;; Linux*) LDSHARED="gcc -shared";; dgux*) LDSHARED="ld -G";; FreeBSD*/3*) LDSHARED="gcc -shared";; @@ -2163,9 +2258,9 @@ then fi echo "$ac_t""$LDSHARED" 1>&6 # CCSHARED are the C *flags* used to create objects to go into a shared -# library -- this is only needed for a few systems +# library (module) -- this is only needed for a few systems echo $ac_n "checking CCSHARED""... $ac_c" 1>&6 -echo "configure:2169: checking CCSHARED" >&5 +echo "configure:2264: checking CCSHARED" >&5 if test -z "$CCSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2187,7 +2282,7 @@ echo "$ac_t""$CCSHARED" 1>&6 # LINKFORSHARED are the flags passed to the $(CC) command that links # the python executable -- this is only needed for a few systems echo $ac_n "checking LINKFORSHARED""... $ac_c" 1>&6 -echo "configure:2191: checking LINKFORSHARED" >&5 +echo "configure:2286: checking LINKFORSHARED" >&5 if test -z "$LINKFORSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2196,7 +2291,13 @@ then LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; FreeBSD/3*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*) LINKFORSHARED="-Xlinker -export-dynamic";; - next/*) LINKFORSHARED="-u libsys_s";; + # -u libsys_s pulls in all symbols in libsys + next/2*|next/3*) LINKFORSHARED="-u libsys_s";; + # -u __dummy makes the linker aware of the objc runtime + # in System.framework; otherwise, __objcInit (referenced in + # crt1.o) gets erroneously defined as common, which breaks dynamic + # loading of any modules which reference it in System.framework + next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;; SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";; NetBSD*) if [ "`$CC -dM -E - &6 # checks for libraries echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2220: checking for dlopen in -ldl" >&5 +echo "configure:2321: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2224,7 +2325,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2340: \"$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 @@ -2263,7 +2364,7 @@ else fi # Dynamic linking for SunOS/Solaris and SYSV echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2267: checking for shl_load in -ldld" >&5 +echo "configure:2368: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2271,7 +2372,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2387: \"$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 @@ -2310,7 +2411,7 @@ else fi # Dynamic linking for HP-UX echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6 -echo "configure:2314: checking for pow in -lm" >&5 +echo "configure:2415: checking for pow in -lm" >&5 ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2318,7 +2419,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2434: \"$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 @@ -2363,7 +2464,7 @@ case "$ac_sys_system" in IRIX*) ;; *) echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6 -echo "configure:2367: checking for t_open in -lnsl" >&5 +echo "configure:2468: checking for t_open in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2371,7 +2472,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2487: \"$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 @@ -2403,7 +2504,7 @@ else fi # SVR4 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2407: checking for socket in -lsocket" >&5 +echo "configure:2508: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2411,7 +2512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2527: \"$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 @@ -2443,7 +2544,7 @@ else fi # SVR4 sockets echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6 -echo "configure:2447: checking for socket in -lnet" >&5 +echo "configure:2548: checking for socket in -lnet" >&5 ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2451,7 +2552,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2567: \"$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 @@ -2486,7 +2587,7 @@ fi esac echo $ac_n "checking for --with-libs""... $ac_c" 1>&6 -echo "configure:2490: checking for --with-libs" >&5 +echo "configure:2591: checking for --with-libs" >&5 # Check whether --with-libs or --without-libs was given. if test "${with_libs+set}" = set; then withval="$with_libs" @@ -2500,7 +2601,7 @@ fi echo $ac_n "checking for --with(out)-readline""... $ac_c" 1>&6 -echo "configure:2504: checking for --with(out)-readline" >&5 +echo "configure:2605: checking for --with(out)-readline" >&5 # Check whether --with-readline or --without-readline was given. if test "${with_readline+set}" = set; then withval="$with_readline" @@ -2515,7 +2616,7 @@ fi USE_THREAD_MODULE="#" echo $ac_n "checking for --with-dec-threads""... $ac_c" 1>&6 -echo "configure:2519: checking for --with-dec-threads" >&5 +echo "configure:2620: checking for --with-dec-threads" >&5 # Check whether --with-dec-threads or --without-dec-threads was given. if test "${with_dec_threads+set}" = set; then @@ -2531,7 +2632,7 @@ fi echo $ac_n "checking for --with-threads""... $ac_c" 1>&6 -echo "configure:2535: checking for --with-threads" >&5 +echo "configure:2636: checking for --with-threads" >&5 # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then withval="$with_threads" @@ -2545,7 +2646,7 @@ fi echo $ac_n "checking for --with-thread""... $ac_c" 1>&6 -echo "configure:2549: checking for --with-thread" >&5 +echo "configure:2650: checking for --with-thread" >&5 # Check whether --with-thread or --without-thread was given. if test "${with_thread+set}" = set; then withval="$with_thread" @@ -2561,17 +2662,17 @@ EOF ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6 -echo "configure:2565: checking for mach/cthreads.h" >&5 +echo "configure:2666: checking for mach/cthreads.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2676: \"$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* @@ -2600,12 +2701,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6 -echo "configure:2604: checking for pthread_detach" >&5 +echo "configure:2705: checking for pthread_detach" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_detach'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_detach=yes" else @@ -2656,17 +2757,17 @@ else ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6 -echo "configure:2660: checking for kernel/OS.h" >&5 +echo "configure:2761: checking for kernel/OS.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2771: \"$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* @@ -2695,7 +2796,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:2699: checking for pthread_create in -lpthreads" >&5 +echo "configure:2800: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2703,7 +2804,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2819: \"$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 @@ -2743,7 +2844,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2747: checking for pthread_create in -lpthread" >&5 +echo "configure:2848: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2751,7 +2852,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2867: \"$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 @@ -2791,7 +2892,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:2795: checking for pthread_create in -lc_r" >&5 +echo "configure:2896: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2799,7 +2900,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2915: \"$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 @@ -2839,7 +2940,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 -echo "configure:2843: checking for __d6_pthread_create in -lthread" >&5 +echo "configure:2944: checking for __d6_pthread_create in -lthread" >&5 ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2847,7 +2948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2963: \"$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 @@ -2887,7 +2988,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:2891: checking for pthread_create in -lcma" >&5 +echo "configure:2992: checking for pthread_create in -lcma" >&5 ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2895,7 +2996,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3011: \"$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 @@ -2952,7 +3053,7 @@ fi echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6 -echo "configure:2956: checking for usconfig in -lmpc" >&5 +echo "configure:3057: checking for usconfig in -lmpc" >&5 ac_lib_var=`echo mpc'_'usconfig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2960,7 +3061,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3076: \"$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 @@ -2997,7 +3098,7 @@ else fi echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:3001: checking for thr_create in -lthread" >&5 +echo "configure:3102: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3005,7 +3106,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3121: \"$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 @@ -3052,7 +3153,7 @@ fi DLINCLDIR=/ echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6 -echo "configure:3056: checking for --with-sgi-dl" >&5 +echo "configure:3157: checking for --with-sgi-dl" >&5 # Check whether --with-sgi-dl or --without-sgi-dl was given. if test "${with_sgi_dl+set}" = set; then withval="$with_sgi_dl" @@ -3075,7 +3176,7 @@ fi echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6 -echo "configure:3079: checking for --with-dl-dld" >&5 +echo "configure:3180: checking for --with-dl-dld" >&5 # Check whether --with-dl-dld or --without-dl-dld was given. if test "${with_dl_dld+set}" = set; then withval="$with_dl_dld" @@ -3108,12 +3209,12 @@ for ac_func in alarm chown clock dlopen execv flock fork \ tcgetpgrp tcsetpgrp timegm times truncate uname waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3112: checking for $ac_func" >&5 +echo "configure:3213: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3165,12 +3266,12 @@ done for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3169: checking for $ac_func" >&5 +echo "configure:3270: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3221,12 +3322,12 @@ done for ac_func in dup2 getcwd strdup strerror memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3225: checking for $ac_func" >&5 +echo "configure:3326: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3276,12 +3377,12 @@ done echo $ac_n "checking for getpgrp""... $ac_c" 1>&6 -echo "configure:3280: checking for getpgrp" >&5 +echo "configure:3381: checking for getpgrp" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getpgrp=yes" else @@ -3319,14 +3420,14 @@ fi if eval "test \"`echo '$ac_cv_func_'getpgrp`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:3330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define GETPGRP_HAVE_ARG 1 @@ -3342,12 +3443,12 @@ else fi echo $ac_n "checking for setpgrp""... $ac_c" 1>&6 -echo "configure:3346: checking for setpgrp" >&5 +echo "configure:3447: checking for setpgrp" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpgrp=yes" else @@ -3385,14 +3486,14 @@ fi if eval "test \"`echo '$ac_cv_func_'setpgrp`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int main() { setpgrp(0,0); ; return 0; } EOF -if { (eval echo configure:3396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SETPGRP_HAVE_ARG 1 @@ -3408,12 +3509,12 @@ else fi echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 -echo "configure:3412: checking for gettimeofday" >&5 +echo "configure:3513: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else @@ -3451,14 +3552,14 @@ fi if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int main() { gettimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:3462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3477,12 +3578,12 @@ fi # checks for structures echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3481: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3582: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3491,7 +3592,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3512,12 +3613,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3516: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3617: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3525,7 +3626,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3546,12 +3647,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3550: checking for tm_zone in struct tm" >&5 +echo "configure:3651: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3559,7 +3660,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3579,12 +3680,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3583: checking for tzname" >&5 +echo "configure:3684: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3594,7 +3695,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3617,19 +3718,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:3621: checking for time.h that defines altzone" >&5 +echo "configure:3722: checking for time.h that defines altzone" >&5 if eval "test \"`echo '$''{'ac_cv_header_time_altzone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:3633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3734: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time_altzone=yes else @@ -3651,9 +3752,9 @@ fi was_it_defined=no echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3655: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo "configure:3756: checking whether sys/select.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < @@ -3664,7 +3765,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:3668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 @@ -3680,14 +3781,14 @@ echo "$ac_t""$was_it_defined" 1>&6 # checks for compiler characteristics echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3684: checking whether char is unsigned" >&5 +echo "configure:3785: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3744,12 +3845,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3748: checking for working const" >&5 +echo "configure:3849: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3903: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3821,16 +3922,16 @@ fi works=no echo $ac_n "checking for working volatile""... $ac_c" 1>&6 -echo "configure:3825: checking for working volatile" >&5 +echo "configure:3926: checking for working volatile" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -3847,16 +3948,16 @@ echo "$ac_t""$works" 1>&6 works=no echo $ac_n "checking for working signed char""... $ac_c" 1>&6 -echo "configure:3851: checking for working signed char" >&5 +echo "configure:3952: checking for working signed char" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -3873,16 +3974,16 @@ echo "$ac_t""$works" 1>&6 have_prototypes=no echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:3877: checking for prototypes" >&5 +echo "configure:3978: checking for prototypes" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_PROTOTYPES 1 @@ -3897,9 +3998,9 @@ echo "$ac_t""$have_prototypes" 1>&6 works=no echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:3901: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:4002: checking for variable length prototypes and stdarg.h" >&5 cat > conftest.$ac_ext < @@ -3916,7 +4017,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:3920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 @@ -3932,16 +4033,16 @@ echo "$ac_t""$works" 1>&6 if test "$have_prototypes" = yes; then bad_prototypes=no echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6 -echo "configure:3936: checking for bad exec* prototypes" >&5 +echo "configure:4037: checking for bad exec* prototypes" >&5 cat > conftest.$ac_ext < int main() { char **t;execve("@",t,t); ; return 0; } EOF -if { (eval echo configure:3945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3958,12 +4059,12 @@ fi bad_forward=no echo $ac_n "checking for bad static forward""... $ac_c" 1>&6 -echo "configure:3962: checking for bad static forward" >&5 +echo "configure:4063: checking for bad static forward" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3998,9 +4099,9 @@ echo "$ac_t""$bad_forward" 1>&6 va_list_is_array=no echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6 -echo "configure:4002: checking whether va_list is an array" >&5 +echo "configure:4103: checking whether va_list is an array" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4032,7 +4133,7 @@ echo "$ac_t""$va_list_is_array" 1>&6 # Linux requires this for correct f.p. operations echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6 -echo "configure:4036: checking for __fpu_control in -lieee" >&5 +echo "configure:4137: checking for __fpu_control in -lieee" >&5 ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4040,7 +4141,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4156: \"$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 @@ -4081,7 +4182,7 @@ fi # Check for --with-fpectl echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6 -echo "configure:4085: checking for --with-fpectl" >&5 +echo "configure:4186: checking for --with-fpectl" >&5 # Check whether --with-fpectl or --without-fpectl was given. if test "${with_fpectl+set}" = set; then withval="$with_fpectl" @@ -4104,7 +4205,7 @@ BeOS) ;; *) LIBM=-lm esac echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6 -echo "configure:4108: checking for --with-libm=STRING" >&5 +echo "configure:4209: checking for --with-libm=STRING" >&5 # Check whether --with-libm or --without-libm was given. if test "${with_libm+set}" = set; then withval="$with_libm" @@ -4125,7 +4226,7 @@ fi # check for --with-libc=... echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6 -echo "configure:4129: checking for --with-libc=STRING" >&5 +echo "configure:4230: checking for --with-libc=STRING" >&5 # Check whether --with-libc or --without-libc was given. if test "${with_libc+set}" = set; then withval="$with_libc" @@ -4149,12 +4250,12 @@ LIBS="$LIBS $LIBM" for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4153: checking for $ac_func" >&5 +echo "configure:4254: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4204,12 +4305,12 @@ done for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4208: checking for $ac_func" >&5 +echo "configure:4309: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4262,7 +4363,7 @@ LIBS=$LIBS_SAVE # check for getopt echo $ac_n "checking for genuine getopt""... $ac_c" 1>&6 -echo "configure:4266: checking for genuine getopt" >&5 +echo "configure:4367: checking for genuine getopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4270,7 +4371,7 @@ else ac_cv_func_getopt=no else cat > conftest.$ac_ext < extern int optind, opterr, getopt(); @@ -4282,7 +4383,7 @@ int main() { exit(0); } EOF -if { (eval echo configure:4286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getopt=yes else @@ -4300,7 +4401,7 @@ test $ac_cv_func_getopt = no && LIBOBJS="$LIBOBJS getopt.o" # check whether malloc(0) returns NULL or not echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6 -echo "configure:4304: checking what malloc(0) returns" >&5 +echo "configure:4405: checking what malloc(0) returns" >&5 if eval "test \"`echo '$''{'ac_cv_malloc_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4308,7 +4409,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB @@ -4327,7 +4428,7 @@ main() { exit(0); } EOF -if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_malloc_zero=nonnull else @@ -4493,17 +4594,18 @@ s%@MACHDEP@%$MACHDEP%g s%@SGI_ABI@%$SGI_ABI%g s%@SET_CCC@%$SET_CCC%g s%@CC@%$CC%g +s%@MAKE_LDLIBRARY@%$MAKE_LDLIBRARY%g +s%@LDLIBRARY@%$LDLIBRARY%g s%@LINKCC@%$LINKCC%g s%@RANLIB@%$RANLIB%g s%@AR@%$AR%g s%@INSTALL@%$INSTALL%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@REALLIBRARY@%$REALLIBRARY%g s%@LN@%$LN%g s%@OPT@%$OPT%g s%@CPP@%$CPP%g -s%@DGUX_IS_BROKEN@%$DGUX_IS_BROKEN%g +s%@LIBTOOL_CRUFT@%$LIBTOOL_CRUFT%g s%@SO@%$SO%g s%@LDSHARED@%$LDSHARED%g s%@CCSHARED@%$CCSHARED%g diff --git a/configure.in b/configure.in index 4b78779..1996595 100644 --- a/configure.in +++ b/configure.in @@ -9,7 +9,7 @@ AC_SUBST(VERSION) VERSION=1.5 # NEXTSTEP stuff -if test -f /usr/lib/NextStep/software_version; then +if test -f /usr/lib/NextStep/software_version -o -f /System/Library/CoreServices/software_version ; then AC_MSG_CHECKING(for --with-next-archs) AC_ARG_WITH(next-archs, @@ -24,7 +24,7 @@ if test -f /usr/lib/NextStep/software_version; then if test -z "$MACHDEP" then - set X `hostinfo | grep 'NeXT Mach.*:' | \ + set X `hostinfo | egrep '(NeXT Mach|Kernel Release).*:' | \ sed -e 's/://' -e 's/\./_/'` && \ ac_sys_system=next && ac_sys_release=$4 @@ -32,6 +32,10 @@ if test -f /usr/lib/NextStep/software_version; then fi fi +AC_ARG_WITH(next-framework, +[--with-next-framework Build (OpenStep|Rhapsody|MacOS10) framework],,) +AC_ARG_WITH(dyld, +[--with-dyld Use (OpenStep|Rhapsody|MacOS10) dynamic linker],,) # Set name for machine-dependent library files AC_SUBST(MACHDEP) @@ -172,6 +176,14 @@ BeOS*) esac;; esac +# LDLIBRARY is the name of the library to link against (as opposed to the +# name of the library into which to insert object files). On systems +# without shared libraries, LDLIBRARY is the same as LIBRARY (defined in +# the Makefiles). +AC_SUBST(MAKE_LDLIBRARY) +AC_SUBST(LDLIBRARY) +LDLIBRARY='' + # LINKCC is the command that links the python executable -- default is $(CC). # This is altered for AIX and BeOS in order to build the export list before # linking. @@ -184,7 +196,7 @@ then LINKCC="\$(srcdir)/makexp_aix python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";; BeOS*) LINKCC="\$(srcdir)/../BeOS/linkcc \$(LIBRARY) \$(PURIFY) \$(CC) \$(OPT)" - REALLIBRARY='libpython$(VERSION).so';; + LDLIBRARY='libpython$(VERSION).so';; dgux*) LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";; *) LINKCC="\$(PURIFY) \$(CC)";; @@ -192,13 +204,38 @@ then fi AC_MSG_RESULT($LINKCC) +AC_MSG_CHECKING(LDLIBRARY) + +# NeXT framework builds require that the 'ar' library be converted into +# a bundle using libtool. +if test "$with_next_framework" +then + LDLIBRARY='libpython$(VERSION).dylib' +fi + +# DG/UX requires some fancy ld contortions to produce a .so from an .a +if test "$MACHDEP" = "dguxR4" +then + LDLIBRARY='libpython$(VERSION).so' + OPT="$OPT -pic" +fi +AC_MSG_RESULT($LDLIBRARY) + +# If LDLIBRARY is different from LIBRARY, emit a rule to build it. +if test -z "$LDLIBRARY" +then + LDLIBRARY='libpython$(VERSION).a' + MAKE_LDLIBRARY="true" +else + MAKE_LDLIBRARY='$(MAKE) $(LDLIBRARY)' +fi + AC_PROG_RANLIB AC_SUBST(AR) AC_CHECK_PROGS(AR, ar aal, ar) AC_SUBST(INSTALL) AC_SUBST(INSTALL_PROGRAM) AC_SUBST(INSTALL_DATA) -AC_SUBST(REALLIBRARY) # Install just never works :-( if test -z "$INSTALL" then @@ -268,17 +305,6 @@ else fi fi -AC_SUBST(DGUX_IS_BROKEN) -if test "$MACHDEP" != "dguxR4" -then - REALLIBRARY='libpython$(VERSION).a' - DGUX_IS_BROKEN="true" -else - REALLIBRARY='libpython$(VERSION).so' - OPT="$OPT -pic" - DGUX_IS_BROKEN="make $REALLIBRARY" -fi - # check for ANSI or K&R ("traditional") preprocessor AC_MSG_CHECKING(for C preprocessor type) AC_TRY_COMPILE([ @@ -356,6 +382,45 @@ else fi +# Minor variations in building a framework between NextStep versions 4 and 5 +AC_SUBST(LIBTOOL_CRUFT) +case $ac_sys_system/$ac_sys_release in + next/4*) + ns_undef_sym='__environ' + LIBTOOL_CRUFT="-U $ns_undef_sym" ;; + next/5*) + ns_undef_sym='_environ' + LIBTOOL_CRUFT="-lcc_dynamic -U $ns_undef_sym" ;; +esac + +AC_MSG_CHECKING(for --with-next-framework) +if test "$with_next_framework" +then + OPT="$OPT -fno-common" + # -U __environ is needed since bundles don't have access + # to crt0 when built but will always be linked against it + LDFLAGS="$LDFLAGS -Wl,-U,$ns_undef_sym" + AC_DEFINE(WITH_NEXT_FRAMEWORK) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + +AC_MSG_CHECKING(for --with-dyld) +if test "$with_next_framework" -o "$with_dyld" +then + if test "$with_dyld" + then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(required for framework build) + fi + AC_DEFINE(WITH_DYLD) + ns_dyld='set' +else + AC_MSG_RESULT(no) +fi + # Set info about shared libraries. AC_SUBST(SO) AC_SUBST(LDSHARED) @@ -374,6 +439,8 @@ fi AC_MSG_RESULT($SO) # LDSHARED is the ld *command* used to create shared library # -- "ld" on SunOS 4.x.x, "ld -G" on SunOS 5.x, "ld -shared" on IRIX 5 +# (Shared libraries in this instance are shared modules to be loaded into +# Python, as opposed to building Python itself as a shared library.) AC_MSG_CHECKING(LDSHARED) if test -z "$LDSHARED" then @@ -387,7 +454,14 @@ then hp*|HP*) LDSHARED="ld -b";; OSF*) LDSHARED="ld -shared -expect_unresolved \"*\"";; DYNIX/ptx*) LDSHARED="ld -G";; - next/*) LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';; + next/*) + if test "$ns_dyld" + then LDSHARED='$(CC) $(LDFLAGS) -bundle -prebind' + else LDSHARED='$(CC) $(CFLAGS) -nostdlib -r'; + fi + if test "$with_next_framework" ; then + LDSHARED="$LDSHARED \$(LDLIBRARY)" + fi ;; Linux*) LDSHARED="gcc -shared";; dgux*) LDSHARED="ld -G";; FreeBSD*/3*) LDSHARED="gcc -shared";; @@ -405,7 +479,7 @@ then fi AC_MSG_RESULT($LDSHARED) # CCSHARED are the C *flags* used to create objects to go into a shared -# library -- this is only needed for a few systems +# library (module) -- this is only needed for a few systems AC_MSG_CHECKING(CCSHARED) if test -z "$CCSHARED" then @@ -436,7 +510,13 @@ then LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; FreeBSD/3*) LINKFORSHARED="-Xlinker -export-dynamic";; Linux*) LINKFORSHARED="-Xlinker -export-dynamic";; - next/*) LINKFORSHARED="-u libsys_s";; + # -u libsys_s pulls in all symbols in libsys + next/2*|next/3*) LINKFORSHARED="-u libsys_s";; + # -u __dummy makes the linker aware of the objc runtime + # in System.framework; otherwise, __objcInit (referenced in + # crt1.o) gets erroneously defined as common, which breaks dynamic + # loading of any modules which reference it in System.framework + next/4*|next/5*) LINKFORSHARED="-u __dummy -framework System" ;; SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";; NetBSD*) if [[ "`$CC -dM -E -