diff options
| -rw-r--r-- | Include/Python.h | 2 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 9 | ||||
| -rw-r--r-- | Python/thread.c | 7 | ||||
| -rw-r--r-- | acconfig.h | 6 | ||||
| -rw-r--r-- | config.h.in | 20 | ||||
| -rwxr-xr-x | configure | 1022 | ||||
| -rw-r--r-- | configure.in | 13 |
7 files changed, 521 insertions, 558 deletions
diff --git a/Include/Python.h b/Include/Python.h index 46bfda2..153ba07 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -111,7 +111,7 @@ #define Py_file_input 257 #define Py_eval_input 258 -#ifdef _GNU_PTH +#ifdef HAVE_PTH /* GNU pth user-space thread support */ #include <pth.h> #endif diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 9c5a18f..b9f7963 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -62,6 +62,9 @@ handler ignores signals if getpid() isn't the same as in the main thread. XXX This is a hack. + GNU pth is a user-space threading library, and as such, all threads + run within the same process. In this case, if the currently running + thread is not the main_thread, send the signal to the main_thread. */ #ifdef WITH_THREAD @@ -109,6 +112,12 @@ static void signal_handler(int sig_num) { #ifdef WITH_THREAD +#ifdef WITH_PTH + if (PyThread_get_thread_ident() != main_thread) { + pth_raise(*(pth_t *) main_thread, sig_num); + return; + } +#endif /* See NOTES section above */ if (getpid() == main_pid) { #endif diff --git a/Python/thread.c b/Python/thread.c index 9c75c2f..f366a71 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -109,13 +109,14 @@ void PyThread_init_thread(void) #include "thread_lwp.h" #endif -#ifdef _GNU_PTH +#ifdef HAVE_PTH #include "thread_pth.h" -#else +#undef _POSIX_THREADS +#endif + #ifdef _POSIX_THREADS #include "thread_pthread.h" #endif -#endif #ifdef C_THREADS #include "thread_cthread.h" @@ -35,9 +35,6 @@ This is the case on Motorola V4 (R40V4.2) */ #undef GETTIMEOFDAY_NO_TZ -/* Define if you have GNU PTH threads */ -#undef _GNU_PTH - /* Define this if your time.h defines altzone */ #undef HAVE_ALTZONE @@ -65,6 +62,9 @@ /* Define if your compiler supports function prototypes */ #undef HAVE_PROTOTYPES +/* Define if you have GNU PTH threads */ +#undef HAVE_PTH + /* Define if your compiler supports variable length function prototypes (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */ #undef HAVE_STDARG_PROTOTYPES diff --git a/config.h.in b/config.h.in index 9e4bdad..81831f9 100644 --- a/config.h.in +++ b/config.h.in @@ -103,9 +103,6 @@ This is the case on Motorola V4 (R40V4.2) */ #undef GETTIMEOFDAY_NO_TZ -/* Define if you have GNU PTH threads */ -#undef _GNU_PTH - /* Define this if your time.h defines altzone */ #undef HAVE_ALTZONE @@ -130,6 +127,9 @@ /* Define if your compiler supports function prototypes */ #undef HAVE_PROTOTYPES +/* Define if you have GNU PTH threads */ +#undef HAVE_PTH + /* Define if your compiler supports variable length function prototypes (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */ #undef HAVE_STDARG_PROTOTYPES @@ -272,6 +272,9 @@ /* The number of bytes in a void *. */ #undef SIZEOF_VOID_P +/* Define if you have the _getpty function. */ +#undef HAVE__GETPTY + /* Define if you have the alarm function. */ #undef HAVE_ALARM @@ -359,9 +362,6 @@ /* Define if you have the getpid function. */ #undef HAVE_GETPID -/* Define if you have the _getpty function. */ -#undef HAVE__GETPTY - /* Define if you have the getpwent function. */ #undef HAVE_GETPWENT @@ -521,14 +521,14 @@ /* Define if you have the waitpid function. */ #undef HAVE_WAITPID -/* Define if you have the <db_185.h> header file. */ -#undef HAVE_DB_185_H +/* Define if you have the <db.h> header file. */ +#undef HAVE_DB_H /* Define if you have the <db1/ndbm.h> header file. */ #undef HAVE_DB1_NDBM_H -/* Define if you have the <db.h> header file. */ -#undef HAVE_DB_H +/* Define if you have the <db_185.h> header file. */ +#undef HAVE_DB_185_H /* Define if you have the <dirent.h> header file. */ #undef HAVE_DIRENT_H @@ -1,9 +1,9 @@ #! /bin/sh -# From configure.in Revision: 1.157 +# From configure.in Revision: 1.159 # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.14.1 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -34,6 +34,8 @@ ac_help="$ac_help ac_help="$ac_help --with(out)-thread[=DIRECTORY] deprecated; use --with(out)-threads" ac_help="$ac_help + --with-pth use GNU pth threading libraries" +ac_help="$ac_help --with(out)-cycle-gc disable/enable garbage collection" ac_help="$ac_help --with(out)-libdb disable/enable bsddb module" @@ -371,7 +373,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.14.1" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -531,7 +533,7 @@ done if test -r "$cache_file"; then echo "loading cache $cache_file" - test -f "$cache_file" && . $cache_file + . $cache_file else echo "creating cache $cache_file" > $cache_file @@ -569,7 +571,7 @@ VERSION=2.0 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:573: checking for --with-next-archs" >&5 +echo "configure:575: 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" @@ -612,7 +614,7 @@ fi # Set name for machine-dependent library files echo $ac_n "checking MACHDEP""... $ac_c" 1>&6 -echo "configure:616: checking MACHDEP" >&5 +echo "configure:618: checking MACHDEP" >&5 if test -z "$MACHDEP" then ac_sys_system=`uname -s` @@ -672,7 +674,7 @@ echo "$ac_t""$MACHDEP" 1>&6 # checks for alternative programs echo $ac_n "checking for --without-gcc""... $ac_c" 1>&6 -echo "configure:676: checking for --without-gcc" >&5 +echo "configure:678: checking for --without-gcc" >&5 # Check whether --with-gcc or --without-gcc was given. if test "${with_gcc+set}" = set; then withval="$with_gcc" @@ -746,7 +748,7 @@ echo "$ac_t""$without_gcc" 1>&6 MAINOBJ=python.o echo $ac_n "checking for --with-cxx=<compiler>""... $ac_c" 1>&6 -echo "configure:750: checking for --with-cxx=<compiler>" >&5 +echo "configure:752: checking for --with-cxx=<compiler>" >&5 # Check whether --with-cxx or --without-cxx was given. if test "${with_cxx+set}" = set; then withval="$with_cxx" @@ -790,8 +792,8 @@ 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:794: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:796: 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 if test -n "$CC"; then @@ -820,8 +822,8 @@ 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:824: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:826: 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 if test -n "$CC"; then @@ -867,12 +869,12 @@ fi if test -z "$CC"; then case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN*) + *win32* | *WIN32*) # 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:875: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then +echo "configure:877: 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 if test -n "$CC"; then @@ -902,8 +904,8 @@ fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:907: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:909: 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. @@ -914,12 +916,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 918 "configure" +#line 920 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:925: \"$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 @@ -944,14 +946,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 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 $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:949: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:951: 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:954: checking whether we are using GNU C" >&5 -if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then +echo "configure:956: 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 cat > conftest.c <<EOF @@ -959,7 +961,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:963: \"$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:965: \"$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 @@ -978,8 +980,8 @@ 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:982: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then +echo "configure:984: 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 echo 'void f(){}' > conftest.c @@ -1045,7 +1047,7 @@ LDLIBRARY='' # linking. echo $ac_n "checking LINKCC""... $ac_c" 1>&6 -echo "configure:1049: checking LINKCC" >&5 +echo "configure:1051: checking LINKCC" >&5 if test -z "$LINKCC" -a ! -z "$CXX" then LINKCC="$CXX" @@ -1068,7 +1070,7 @@ fi echo "$ac_t""$LINKCC" 1>&6 echo $ac_n "checking LDLIBRARY""... $ac_c" 1>&6 -echo "configure:1072: checking LDLIBRARY" >&5 +echo "configure:1074: checking LDLIBRARY" >&5 # NeXT framework builds require that the 'ar' library be converted into # a bundle using libtool. @@ -1097,8 +1099,8 @@ 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:1101: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then +echo "configure:1103: 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 if test -n "$RANLIB"; then @@ -1130,8 +1132,8 @@ 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:1134: checking for $ac_word" >&5 -if eval "test \"\${ac_cv_prog_AR+set}\" = set"; then +echo "configure:1136: 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 if test -n "$AR"; then @@ -1209,13 +1211,13 @@ 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:1213: checking how to run the C preprocessor" >&5 +echo "configure:1215: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then -if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # This must be in double quotes, not single quotes, because CPP may get @@ -1224,13 +1226,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 1228 "configure" +#line 1230 "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:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1236: \"$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 : @@ -1241,13 +1243,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1245 "configure" +#line 1247 "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:1251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1253: \"$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 : @@ -1258,13 +1260,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1262 "configure" +#line 1264 "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:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1270: \"$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 : @@ -1289,9 +1291,9 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1293: checking for AIX" >&5 +echo "configure:1295: checking for AIX" >&5 cat > conftest.$ac_ext <<EOF -#line 1295 "configure" +#line 1297 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1314,17 +1316,17 @@ rm -f conftest* ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1318: checking for minix/config.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:1320: 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 -#line 1323 "configure" +#line 1325 "configure" #include "confdefs.h" #include <minix/config.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1330: \"$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* @@ -1363,8 +1365,8 @@ fi echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6 -echo "configure:1367: checking whether $CC accepts -OPT:Olimit=0" >&5 -if eval "test \"\${ac_cv_opt_olimit_ok+set}\" = set"; then +echo "configure:1369: 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 ac_save_cc="$CC" @@ -1373,11 +1375,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 <<EOF -#line 1377 "configure" +#line 1379 "configure" #include "confdefs.h" int main() { return 0; } EOF -if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1383: \"$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 @@ -1397,8 +1399,8 @@ 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:1401: checking whether $CC accepts -Olimit 1500" >&5 - if eval "test \"\${ac_cv_olimit_ok+set}\" = set"; then +echo "configure:1403: 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 ac_save_cc="$CC" @@ -1407,11 +1409,11 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1411 "configure" +#line 1413 "configure" #include "confdefs.h" int main() { return 0; } EOF -if { (eval echo configure:1415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1417: \"$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 @@ -1435,12 +1437,12 @@ fi # checks for header files echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1439: checking for ANSI C header files" >&5 -if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then +echo "configure:1441: 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 <<EOF -#line 1444 "configure" +#line 1446 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1448,7 +1450,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1452: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1454: \"$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* @@ -1465,7 +1467,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 -#line 1469 "configure" +#line 1471 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1483,7 +1485,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 -#line 1487 "configure" +#line 1489 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1504,7 +1506,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1508 "configure" +#line 1510 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1515,7 +1517,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1547,17 +1549,17 @@ ndbm.h db1/ndbm.h gdbm/ndbm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1551: checking for $ac_hdr" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:1553: 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 1556 "configure" +#line 1558 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1563: \"$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* @@ -1588,12 +1590,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:1592: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then +echo "configure:1594: 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 1597 "configure" +#line 1599 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1601,7 +1603,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1626,15 +1628,15 @@ 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:1630: checking for opendir in -ldir" >&5 +echo "configure:1632: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1638 "configure" +#line 1640 "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 @@ -1645,7 +1647,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1667,15 +1669,15 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1671: checking for opendir in -lx" >&5 +echo "configure:1673: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1679 "configure" +#line 1681 "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 @@ -1686,7 +1688,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1692: \"$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 @@ -1712,9 +1714,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:1716: checking for clock_t in time.h" >&5 +echo "configure:1718: checking for clock_t in time.h" >&5 cat > conftest.$ac_ext <<EOF -#line 1718 "configure" +#line 1720 "configure" #include "confdefs.h" #include <time.h> EOF @@ -1742,12 +1744,12 @@ EOF # Type availability checks echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:1746: checking for mode_t" >&5 -if eval "test \"\${ac_cv_type_mode_t+set}\" = set"; then +echo "configure:1748: 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 <<EOF -#line 1751 "configure" +#line 1753 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1758,19 +1760,17 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_mode_t=yes" + ac_cv_type_mode_t=yes else rm -rf conftest* - eval "ac_cv_type_mode_t=no" + ac_cv_type_mode_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'mode_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_mode_t" 1>&6 +if test $ac_cv_type_mode_t = no; then + cat >> confdefs.h <<\EOF #define mode_t int EOF @@ -1778,7 +1778,7 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 echo "configure:1781: checking for off_t" >&5 -if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then +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 <<EOF @@ -1793,31 +1793,29 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_off_t=yes" + ac_cv_type_off_t=yes else rm -rf conftest* - eval "ac_cv_type_off_t=no" + ac_cv_type_off_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'off_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_off_t" 1>&6 +if test $ac_cv_type_off_t = no; then + cat >> confdefs.h <<\EOF #define off_t long EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1816: checking for pid_t" >&5 -if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then +echo "configure:1814: 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 <<EOF -#line 1821 "configure" +#line 1819 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1828,31 +1826,29 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_pid_t=yes" + ac_cv_type_pid_t=yes else rm -rf conftest* - eval "ac_cv_type_pid_t=no" + ac_cv_type_pid_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'pid_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_pid_t" 1>&6 +if test $ac_cv_type_pid_t = no; then + cat >> confdefs.h <<\EOF #define pid_t int EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1851: checking return type of signal handlers" >&5 -if eval "test \"\${ac_cv_type_signal+set}\" = set"; then +echo "configure:1847: 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 <<EOF -#line 1856 "configure" +#line 1852 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -1869,7 +1865,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1888,12 +1884,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1892: checking for size_t" >&5 -if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then +echo "configure:1888: 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 <<EOF -#line 1897 "configure" +#line 1893 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1904,31 +1900,29 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_size_t=yes" + ac_cv_type_size_t=yes else rm -rf conftest* - eval "ac_cv_type_size_t=no" + ac_cv_type_size_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_size_t" 1>&6 +if test $ac_cv_type_size_t = no; then + cat >> confdefs.h <<\EOF #define size_t unsigned EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1927: checking for uid_t in sys/types.h" >&5 -if eval "test \"\${ac_cv_type_uid_t+set}\" = set"; then +echo "configure:1921: 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 -#line 1932 "configure" +#line 1926 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1959,15 +1953,15 @@ fi # Sizes of various common basic types echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1963: checking size of int" >&5 -if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then +echo "configure:1957: 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 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 <<EOF -#line 1971 "configure" +#line 1965 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1978,7 +1972,7 @@ main() exit(0); } EOF -if { (eval echo configure:1982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1976: \"$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 @@ -1998,15 +1992,15 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2002: checking size of long" >&5 -if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then +echo "configure:1996: 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 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 <<EOF -#line 2010 "configure" +#line 2004 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2017,7 +2011,7 @@ main() exit(0); } EOF -if { (eval echo configure:2021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2015: \"$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 @@ -2037,15 +2031,15 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:2041: checking size of void *" >&5 -if eval "test \"\${ac_cv_sizeof_void_p+set}\" = set"; then +echo "configure:2035: 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 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 <<EOF -#line 2049 "configure" +#line 2043 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2056,7 +2050,7 @@ main() exit(0); } EOF -if { (eval echo configure:2060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2054: \"$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 @@ -2076,15 +2070,15 @@ EOF echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2080: checking size of char" >&5 -if eval "test \"\${ac_cv_sizeof_char+set}\" = set"; then +echo "configure:2074: checking size of char" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2088 "configure" +#line 2082 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2095,7 +2089,7 @@ main() exit(0); } EOF -if { (eval echo configure:2099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2115,15 +2109,15 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2119: checking size of short" >&5 -if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then +echo "configure:2113: checking size of short" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2127 "configure" +#line 2121 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2134,7 +2128,7 @@ main() exit(0); } EOF -if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2154,15 +2148,15 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2158: checking size of float" >&5 -if eval "test \"\${ac_cv_sizeof_float+set}\" = set"; then +echo "configure:2152: checking size of float" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2166 "configure" +#line 2160 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2173,7 +2167,7 @@ main() exit(0); } EOF -if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2193,15 +2187,15 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2197: checking size of double" >&5 -if eval "test \"\${ac_cv_sizeof_double+set}\" = set"; then +echo "configure:2191: checking size of double" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2205 "configure" +#line 2199 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2212,7 +2206,7 @@ main() exit(0); } EOF -if { (eval echo configure:2216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2232,15 +2226,15 @@ EOF echo $ac_n "checking size of fpos_t""... $ac_c" 1>&6 -echo "configure:2236: checking size of fpos_t" >&5 -if eval "test \"\${ac_cv_sizeof_fpos_t+set}\" = set"; then +echo "configure:2230: checking size of fpos_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_fpos_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2244 "configure" +#line 2238 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2251,7 +2245,7 @@ main() exit(0); } EOF -if { (eval echo configure:2255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_fpos_t=`cat conftestval` else @@ -2272,17 +2266,17 @@ EOF echo $ac_n "checking for long long support""... $ac_c" 1>&6 -echo "configure:2276: checking for long long support" >&5 +echo "configure:2270: checking for long long support" >&5 have_long_long=no cat > conftest.$ac_ext <<EOF -#line 2279 "configure" +#line 2273 "configure" #include "confdefs.h" int main() { long long x; x = (long long)0; ; return 0; } EOF -if { (eval echo configure:2286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_LONG_LONG 1 @@ -2296,15 +2290,15 @@ 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:2300: checking size of long long" >&5 -if eval "test \"\${ac_cv_sizeof_long_long+set}\" = set"; then +echo "configure:2294: 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 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 <<EOF -#line 2308 "configure" +#line 2302 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2315,7 +2309,7 @@ main() exit(0); } EOF -if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2313: \"$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 @@ -2337,17 +2331,17 @@ EOF fi echo $ac_n "checking for uintptr_t support""... $ac_c" 1>&6 -echo "configure:2341: checking for uintptr_t support" >&5 +echo "configure:2335: checking for uintptr_t support" >&5 have_uintptr_t=no cat > conftest.$ac_ext <<EOF -#line 2344 "configure" +#line 2338 "configure" #include "confdefs.h" int main() { uintptr_t x; x = (uintptr_t)0; ; return 0; } EOF -if { (eval echo configure:2351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UINTPTR_T 1 @@ -2361,15 +2355,15 @@ rm -f conftest* echo "$ac_t""$have_uintptr_t" 1>&6 if test "$have_uintptr_t" = yes ; then echo $ac_n "checking size of uintptr_t""... $ac_c" 1>&6 -echo "configure:2365: checking size of uintptr_t" >&5 -if eval "test \"\${ac_cv_sizeof_uintptr_t+set}\" = set"; then +echo "configure:2359: checking size of uintptr_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_uintptr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2373 "configure" +#line 2367 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -2380,7 +2374,7 @@ main() exit(0); } EOF -if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uintptr_t=`cat conftestval` else @@ -2403,15 +2397,15 @@ fi # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>. echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2407: checking size of off_t" >&5 -if eval "test \"\${ac_cv_sizeof_off_t+set}\" = set"; then +echo "configure:2401: 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 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 <<EOF -#line 2415 "configure" +#line 2409 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -2423,7 +2417,7 @@ main() exit(0); } EOF -if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2421: \"$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 @@ -2445,7 +2439,7 @@ EOF echo $ac_n "checking whether to enable large file support""... $ac_c" 1>&6 -echo "configure:2449: checking whether to enable large file support" >&5 +echo "configure:2443: 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 @@ -2460,15 +2454,15 @@ fi # AC_CHECK_SIZEOF() doesn't include <time.h>. echo $ac_n "checking size of time_t""... $ac_c" 1>&6 -echo "configure:2464: checking size of time_t" >&5 -if eval "test \"\${ac_cv_sizeof_time_t+set}\" = set"; then +echo "configure:2458: checking size of time_t" >&5 +if eval "test \"`echo '$''{'ac_cv_sizeof_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2472 "configure" +#line 2466 "configure" #include "confdefs.h" #include <stdio.h> #include <time.h> @@ -2480,7 +2474,7 @@ main() exit(0); } EOF -if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_time_t=`cat conftestval` else @@ -2504,17 +2498,17 @@ EOF # if have pthread_t then define SIZEOF_PTHREAD_T echo $ac_n "checking for pthread_t""... $ac_c" 1>&6 -echo "configure:2508: checking for pthread_t" >&5 +echo "configure:2502: checking for pthread_t" >&5 have_pthread_t=no cat > conftest.$ac_ext <<EOF -#line 2511 "configure" +#line 2505 "configure" #include "confdefs.h" #include <pthread.h> int main() { pthread_t x; x = (pthread_t)0; ; return 0; } EOF -if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_pthread_t=yes else @@ -2526,15 +2520,15 @@ echo "$ac_t""$have_pthread_t" 1>&6 if test "$have_pthread_t" = yes ; then # AC_CHECK_SIZEOF() doesn't include <pthread.h>. echo $ac_n "checking size of pthread_t""... $ac_c" 1>&6 -echo "configure:2530: checking size of pthread_t" >&5 - if eval "test \"\${ac_cv_sizeof_pthread_t+set}\" = set"; then +echo "configure:2524: checking size of pthread_t" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_pthread_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else 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 <<EOF -#line 2538 "configure" +#line 2532 "configure" #include "confdefs.h" #include <stdio.h> #include <pthread.h> @@ -2546,7 +2540,7 @@ else exit(0); } EOF -if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_pthread_t=`cat conftestval` else @@ -2581,7 +2575,7 @@ case $ac_sys_system/$ac_sys_release in esac echo $ac_n "checking for --with-next-framework""... $ac_c" 1>&6 -echo "configure:2585: checking for --with-next-framework" >&5 +echo "configure:2579: checking for --with-next-framework" >&5 if test "$with_next_framework" then OPT="$OPT -fno-common" @@ -2598,7 +2592,7 @@ else fi echo $ac_n "checking for --with-dyld""... $ac_c" 1>&6 -echo "configure:2602: checking for --with-dyld" >&5 +echo "configure:2596: checking for --with-dyld" >&5 if test "$with_next_framework" -o "$with_dyld" then if test "$with_dyld" @@ -2624,7 +2618,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:2628: checking SO" >&5 +echo "configure:2622: checking SO" >&5 if test -z "$SO" then case $ac_sys_system in @@ -2638,7 +2632,7 @@ echo "$ac_t""$SO" 1>&6 # (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:2642: checking LDSHARED" >&5 +echo "configure:2636: checking LDSHARED" >&5 if test -z "$LDSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2690,7 +2684,7 @@ echo "$ac_t""$LDSHARED" 1>&6 # CCSHARED are the C *flags* used to create objects to go into a shared # library (module) -- this is only needed for a few systems echo $ac_n "checking CCSHARED""... $ac_c" 1>&6 -echo "configure:2694: checking CCSHARED" >&5 +echo "configure:2688: checking CCSHARED" >&5 if test -z "$CCSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2714,7 +2708,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:2718: checking LINKFORSHARED" >&5 +echo "configure:2712: checking LINKFORSHARED" >&5 if test -z "$LINKFORSHARED" then case $ac_sys_system/$ac_sys_release in @@ -2749,15 +2743,15 @@ echo "$ac_t""$LINKFORSHARED" 1>&6 # checks for libraries echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2753: checking for dlopen in -ldl" >&5 +echo "configure:2747: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2761 "configure" +#line 2755 "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 @@ -2768,7 +2762,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2766: \"$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 @@ -2796,15 +2790,15 @@ else fi # Dynamic linking for SunOS/Solaris and SYSV echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:2800: checking for shl_load in -ldld" >&5 +echo "configure:2794: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 2808 "configure" +#line 2802 "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 @@ -2815,7 +2809,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2813: \"$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 @@ -2845,7 +2839,7 @@ fi # Check for --with-pydebug echo $ac_n "checking for --with-pydebug""... $ac_c" 1>&6 -echo "configure:2849: checking for --with-pydebug" >&5 +echo "configure:2843: checking for --with-pydebug" >&5 # Check whether --with-pydebug or --without-pydebug was given. if test "${with_pydebug+set}" = set; then withval="$with_pydebug" @@ -2865,16 +2859,16 @@ fi # checks for system dependent C++ extensions support case "$ac_sys_system" in AIX*) echo $ac_n "checking for genuine AIX C++ extensions support""... $ac_c" 1>&6 -echo "configure:2869: checking for genuine AIX C++ extensions support" >&5 +echo "configure:2863: checking for genuine AIX C++ extensions support" >&5 cat > conftest.$ac_ext <<EOF -#line 2871 "configure" +#line 2865 "configure" #include "confdefs.h" #include "/usr/lpp/xlC/include/load.h" int main() { loadAndInit("", 0, "") ; return 0; } EOF -if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define AIX_GENUINE_CPLUSPLUS 1 @@ -2898,15 +2892,15 @@ case "$ac_sys_system" in IRIX*) ;; *) echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6 -echo "configure:2902: checking for t_open in -lnsl" >&5 +echo "configure:2896: checking for t_open in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2910 "configure" +#line 2904 "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 @@ -2917,7 +2911,7 @@ int main() { t_open() ; return 0; } EOF -if { (eval echo configure:2921: \"$ac_link\") 1>&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 @@ -2938,15 +2932,15 @@ else fi # SVR4 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2942: checking for socket in -lsocket" >&5 +echo "configure:2936: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2950 "configure" +#line 2944 "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 @@ -2957,7 +2951,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:2961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2955: \"$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 @@ -2982,15 +2976,15 @@ esac case "$ac_sys_system" in BeOS*) echo $ac_n "checking for socket in -lnet""... $ac_c" 1>&6 -echo "configure:2986: checking for socket in -lnet" >&5 +echo "configure:2980: checking for socket in -lnet" >&5 ac_lib_var=`echo net'_'socket | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2994 "configure" +#line 2988 "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 @@ -3001,7 +2995,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2999: \"$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 @@ -3025,7 +3019,7 @@ fi esac echo $ac_n "checking for --with-libs""... $ac_c" 1>&6 -echo "configure:3029: checking for --with-libs" >&5 +echo "configure:3023: checking for --with-libs" >&5 # Check whether --with-libs or --without-libs was given. if test "${with_libs+set}" = set; then withval="$with_libs" @@ -3042,7 +3036,7 @@ fi USE_THREAD_MODULE="" echo $ac_n "checking for --with-dec-threads""... $ac_c" 1>&6 -echo "configure:3046: checking for --with-dec-threads" >&5 +echo "configure:3040: 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 @@ -3059,7 +3053,7 @@ fi echo $ac_n "checking for --with-threads""... $ac_c" 1>&6 -echo "configure:3063: checking for --with-threads" >&5 +echo "configure:3057: checking for --with-threads" >&5 # Check whether --with-threads or --without-threads was given. if test "${with_threads+set}" = set; then withval="$with_threads" @@ -3097,17 +3091,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:3101: checking for mach/cthreads.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3095: 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 -#line 3106 "configure" +#line 3100 "configure" #include "confdefs.h" #include <mach/cthreads.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3105: \"$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* @@ -3135,16 +3129,36 @@ EOF else echo "$ac_t""no" 1>&6 + echo $ac_n "checking for --with-pth""... $ac_c" 1>&6 +echo "configure:3134: checking for --with-pth" >&5 + # Check whether --with-pth or --without-pth was given. +if test "${with_pth+set}" = set; then + withval="$with_pth" + + echo "$ac_t""$withval" 1>&6 + cat >> confdefs.h <<\EOF +#define WITH_THREAD 1 +EOF + + cat >> confdefs.h <<\EOF +#define HAVE_PTH 1 +EOF + + LIBS="-lpth $LIBS" + LIBOBJS="$LIBOBJS thread.o" +else + + echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:3140: checking for pthread_create in -lpthread" >&5 +echo "configure:3154: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 3148 "configure" +#line 3162 "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 @@ -3155,7 +3169,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3173: \"$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 @@ -3184,12 +3198,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6 -echo "configure:3188: checking for pthread_detach" >&5 -if eval "test \"\${ac_cv_func_pthread_detach+set}\" = set"; then +echo "configure:3202: 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 <<EOF -#line 3193 "configure" +#line 3207 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_detach(); below. */ @@ -3198,7 +3212,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_detach(); -char (*f)(); int main() { @@ -3208,12 +3221,12 @@ int main() { #if defined (__stub_pthread_detach) || defined (__stub___pthread_detach) choke me #else -f = pthread_detach; +pthread_detach(); #endif ; return 0; } EOF -if { (eval echo configure:3217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3230: \"$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 @@ -3241,17 +3254,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:3245: checking for kernel/OS.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:3258: 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 -#line 3250 "configure" +#line 3263 "configure" #include "confdefs.h" #include <kernel/OS.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3268: \"$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* @@ -3280,15 +3293,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:3284: checking for pthread_create in -lpthreads" >&5 +echo "configure:3297: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 3292 "configure" +#line 3305 "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 @@ -3299,7 +3312,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3316: \"$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 @@ -3328,15 +3341,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:3332: checking for pthread_create in -lc_r" >&5 +echo "configure:3345: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 3340 "configure" +#line 3353 "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 @@ -3347,7 +3360,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3364: \"$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 @@ -3376,15 +3389,15 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 -echo "configure:3380: checking for __d6_pthread_create in -lthread" >&5 +echo "configure:3393: checking for __d6_pthread_create in -lthread" >&5 ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 3388 "configure" +#line 3401 "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 @@ -3395,7 +3408,7 @@ int main() { __d6_pthread_create() ; return 0; } EOF -if { (eval echo configure:3399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3412: \"$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 @@ -3423,64 +3436,16 @@ EOF else echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pth_init in -lpth""... $ac_c" 1>&6 -echo "configure:3428: checking for pth_init in -lpth" >&5 -ac_lib_var=`echo pth'_'pth_init | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lpth $LIBS" -cat > conftest.$ac_ext <<EOF -#line 3436 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pth_init(); - -int main() { -pth_init() -; return 0; } -EOF -if { (eval echo configure:3447: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define WITH_THREAD 1 -EOF - - cat >> confdefs.h <<\EOF -#define _GNU_PTH 1 -EOF - - LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o" -else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:3476: checking for pthread_create in -lcma" >&5 +echo "configure:3441: checking for pthread_create in -lcma" >&5 ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <<EOF -#line 3484 "configure" +#line 3449 "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 @@ -3491,7 +3456,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3460: \"$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 @@ -3541,15 +3506,15 @@ fi echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6 -echo "configure:3545: checking for usconfig in -lmpc" >&5 +echo "configure:3510: checking for usconfig in -lmpc" >&5 ac_lib_var=`echo mpc'_'usconfig | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lmpc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3553 "configure" +#line 3518 "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 @@ -3560,7 +3525,7 @@ int main() { usconfig() ; return 0; } EOF -if { (eval echo configure:3564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3529: \"$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 @@ -3587,15 +3552,15 @@ else fi echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:3591: checking for thr_create in -lthread" >&5 +echo "configure:3556: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 3599 "configure" +#line 3564 "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 @@ -3606,7 +3571,7 @@ int main() { thr_create() ; return 0; } EOF -if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3575: \"$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 @@ -3638,7 +3603,7 @@ fi USE_GC_MODULE="" echo $ac_n "checking for --with-cycle-gc""... $ac_c" 1>&6 -echo "configure:3642: checking for --with-cycle-gc" >&5 +echo "configure:3607: checking for --with-cycle-gc" >&5 # Check whether --with-cycle-gc or --without-cycle-gc was given. if test "${with_cycle_gc+set}" = set; then withval="$with_cycle_gc" @@ -3665,7 +3630,7 @@ echo "$ac_t""$with_cycle_gc" 1>&6 USE_BSDDB_MODULE="" echo $ac_n "checking for --with-libdb""... $ac_c" 1>&6 -echo "configure:3669: checking for --with-libdb" >&5 +echo "configure:3634: checking for --with-libdb" >&5 # Check whether --with-libdb or --without-libdb was given. if test "${with_libdb+set}" = set; then withval="$with_libdb" @@ -3704,12 +3669,12 @@ then # check for libdb; BSD systems have the DB routines in libc --tg echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:3708: checking for dbopen" >&5 -if eval "test \"\${ac_cv_func_dbopen+set}\" = set"; then +echo "configure:3673: checking for dbopen" >&5 +if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3713 "configure" +#line 3678 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -3718,7 +3683,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dbopen(); -char (*f)(); int main() { @@ -3728,12 +3692,12 @@ int main() { #if defined (__stub_dbopen) || defined (__stub___dbopen) choke me #else -f = dbopen; +dbopen(); #endif ; return 0; } EOF -if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -3751,15 +3715,15 @@ if eval "test \"`echo '$ac_cv_func_'dbopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:3755: checking for dbopen in -ldb" >&5 +echo "configure:3719: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <<EOF -#line 3763 "configure" +#line 3727 "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 @@ -3770,7 +3734,7 @@ int main() { dbopen() ; return 0; } EOF -if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3738: \"$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 @@ -3796,7 +3760,7 @@ fi # Check for --with-wctype-functions echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6 -echo "configure:3800: checking for --with-wctype-functions" >&5 +echo "configure:3764: checking for --with-wctype-functions" >&5 # Check whether --with-wctype-functions or --without-wctype-functions was given. if test "${with_wctype_functions+set}" = set; then withval="$with_wctype_functions" @@ -3818,7 +3782,7 @@ fi DLINCLDIR=/ echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6 -echo "configure:3822: checking for --with-sgi-dl" >&5 +echo "configure:3786: 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" @@ -3842,7 +3806,7 @@ fi echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6 -echo "configure:3846: checking for --with-dl-dld" >&5 +echo "configure:3810: 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" @@ -3871,12 +3835,12 @@ fi for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3875: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3839: 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 <<EOF -#line 3880 "configure" +#line 3844 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3885,7 +3849,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -3895,12 +3858,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3867: \"$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 @@ -3929,7 +3892,7 @@ done # loading of modules. echo $ac_n "checking DYNLOADFILE""... $ac_c" 1>&6 -echo "configure:3933: checking DYNLOADFILE" >&5 +echo "configure:3896: checking DYNLOADFILE" >&5 if test -z "$DYNLOADFILE" then case $ac_sys_system/$ac_sys_release in @@ -3970,12 +3933,12 @@ for ac_func in alarm chown clock confstr ctermid ctermid_r execv \ truncate uname waitpid _getpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3974: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3937: 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 <<EOF -#line 3979 "configure" +#line 3942 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3984,7 +3947,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -3994,12 +3956,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3965: \"$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 @@ -4029,12 +3991,12 @@ done for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4033: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:3995: 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 <<EOF -#line 4038 "configure" +#line 4000 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4043,7 +4005,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4053,12 +4014,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4023: \"$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 @@ -4080,15 +4041,15 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:4084: checking for openpty in -lutil" >&5 +echo "configure:4045: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 4092 "configure" +#line 4053 "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 @@ -4099,7 +4060,7 @@ int main() { openpty() ; return 0; } EOF -if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4064: \"$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 @@ -4128,12 +4089,12 @@ done for ac_func in forkpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4132: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4093: 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 <<EOF -#line 4137 "configure" +#line 4098 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4142,7 +4103,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4152,12 +4112,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4121: \"$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 @@ -4179,15 +4139,15 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for forkpty in -lutil""... $ac_c" 1>&6 -echo "configure:4183: checking for forkpty in -lutil" >&5 +echo "configure:4143: checking for forkpty in -lutil" >&5 ac_lib_var=`echo util'_'forkpty | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 4191 "configure" +#line 4151 "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 @@ -4198,7 +4158,7 @@ int main() { forkpty() ; return 0; } EOF -if { (eval echo configure:4202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4162: \"$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 @@ -4229,12 +4189,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:4233: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4193: 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 <<EOF -#line 4238 "configure" +#line 4198 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4243,7 +4203,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4253,12 +4212,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4221: \"$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 @@ -4286,12 +4245,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:4290: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4249: 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 <<EOF -#line 4295 "configure" +#line 4254 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4300,7 +4259,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4310,12 +4268,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4277: \"$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 @@ -4344,12 +4302,12 @@ done for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4348: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4306: 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 <<EOF -#line 4353 "configure" +#line 4311 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4358,7 +4316,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4368,12 +4325,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4334: \"$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 @@ -4392,14 +4349,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 4396 "configure" +#line 4353 "configure" #include "confdefs.h" #include <unistd.h> int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:4403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define GETPGRP_HAVE_ARG 1 @@ -4418,12 +4375,12 @@ done for ac_func in setpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4422: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4379: 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 <<EOF -#line 4427 "configure" +#line 4384 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4432,7 +4389,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4442,12 +4398,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4407: \"$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 @@ -4466,14 +4422,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 4470 "configure" +#line 4426 "configure" #include "confdefs.h" #include <unistd.h> int main() { setpgrp(0,0); ; return 0; } EOF -if { (eval echo configure:4477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SETPGRP_HAVE_ARG 1 @@ -4492,12 +4448,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4496: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:4452: 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 <<EOF -#line 4501 "configure" +#line 4457 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4506,7 +4462,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -4516,12 +4471,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:4525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4480: \"$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 @@ -4540,14 +4495,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 4544 "configure" +#line 4499 "configure" #include "confdefs.h" #include <sys/time.h> int main() { gettimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:4551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4567,12 +4522,12 @@ done # checks for structures echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4571: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"\${ac_cv_header_time+set}\" = set"; then +echo "configure:4526: 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 <<EOF -#line 4576 "configure" +#line 4531 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -4581,7 +4536,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4602,12 +4557,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4606: checking whether struct tm is in sys/time.h or time.h" >&5 -if eval "test \"\${ac_cv_struct_tm+set}\" = set"; then +echo "configure:4561: 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 <<EOF -#line 4611 "configure" +#line 4566 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4615,7 +4570,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4635,47 +4590,46 @@ EOF fi -echo $ac_n "checking for member tm_zone in aggregate type struct tm""... $ac_c" 1>&6 -echo "configure:4640: checking for member tm_zone in aggregate type struct tm" >&5 -if eval "test \"\${ac_cv_c_struct_member_tm_zone+set}\" = set"; then +echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 +echo "configure:4595: 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 <<EOF -#line 4645 "configure" +#line 4600 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> int main() { -struct tm foo; foo.tm_zone; +struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_c_struct_member_tm_zone=yes + ac_cv_struct_tm_zone=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_c_struct_member_tm_zone=no + ac_cv_struct_tm_zone=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_c_struct_member_tm_zone" 1>&6 -tm_zone="$ac_cv_c_struct_member_tm_zone" -if test "$ac_cv_c_struct_member_tm_zone" = yes; then +echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6 +if test "$ac_cv_struct_tm_zone" = yes; then cat >> confdefs.h <<\EOF #define HAVE_TM_ZONE 1 EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4674: checking for tzname" >&5 -if eval "test \"\${ac_cv_var_tzname+set}\" = set"; then +echo "configure:4628: 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 <<EOF -#line 4679 "configure" +#line 4633 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4685,7 +4639,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4708,19 +4662,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:4712: checking for time.h that defines altzone" >&5 -if eval "test \"\${ac_cv_header_time_altzone+set}\" = set"; then +echo "configure:4666: 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 <<EOF -#line 4717 "configure" +#line 4671 "configure" #include "confdefs.h" #include <time.h> int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:4724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time_altzone=yes else @@ -4742,9 +4696,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:4746: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo "configure:4700: checking whether sys/select.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext <<EOF -#line 4748 "configure" +#line 4702 "configure" #include "confdefs.h" #include <sys/types.h> @@ -4755,7 +4709,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:4759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 @@ -4771,14 +4725,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:4775: checking whether char is unsigned" >&5 -if eval "test \"\${ac_cv_c_char_unsigned+set}\" = set"; then +echo "configure:4729: 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 <<EOF -#line 4782 "configure" +#line 4736 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -4800,7 +4754,7 @@ 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 <<EOF -#line 4804 "configure" +#line 4758 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -4810,7 +4764,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4768: \"$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 @@ -4834,12 +4788,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4838: checking for working const" >&5 -if eval "test \"\${ac_cv_c_const+set}\" = set"; then +echo "configure:4792: 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 <<EOF -#line 4843 "configure" +#line 4797 "configure" #include "confdefs.h" int main() { @@ -4888,7 +4842,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:4892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4909,21 +4863,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4913: checking for inline" >&5 -if eval "test \"\${ac_cv_c_inline+set}\" = set"; then +echo "configure:4867: checking for inline" >&5 +if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 4874 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4951,16 +4905,16 @@ esac works=no echo $ac_n "checking for working volatile""... $ac_c" 1>&6 -echo "configure:4955: checking for working volatile" >&5 +echo "configure:4909: checking for working volatile" >&5 cat > conftest.$ac_ext <<EOF -#line 4957 "configure" +#line 4911 "configure" #include "confdefs.h" int main() { volatile int x; x = 0; ; return 0; } EOF -if { (eval echo configure:4964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -4977,16 +4931,16 @@ echo "$ac_t""$works" 1>&6 works=no echo $ac_n "checking for working signed char""... $ac_c" 1>&6 -echo "configure:4981: checking for working signed char" >&5 +echo "configure:4935: checking for working signed char" >&5 cat > conftest.$ac_ext <<EOF -#line 4983 "configure" +#line 4937 "configure" #include "confdefs.h" int main() { signed char c; ; return 0; } EOF -if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -5003,16 +4957,16 @@ echo "$ac_t""$works" 1>&6 have_prototypes=no echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:5007: checking for prototypes" >&5 +echo "configure:4961: checking for prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 5009 "configure" +#line 4963 "configure" #include "confdefs.h" int foo(int x) { return 0; } int main() { return foo(10); ; return 0; } EOF -if { (eval echo configure:5016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_PROTOTYPES 1 @@ -5027,9 +4981,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:5031: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:4985: checking for variable length prototypes and stdarg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 5033 "configure" +#line 4987 "configure" #include "confdefs.h" #include <stdarg.h> @@ -5046,7 +5000,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:5050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 @@ -5062,16 +5016,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:5066: checking for bad exec* prototypes" >&5 +echo "configure:5020: checking for bad exec* prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 5068 "configure" +#line 5022 "configure" #include "confdefs.h" #include <unistd.h> int main() { char **t;execve("@",t,t); ; return 0; } EOF -if { (eval echo configure:5075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5088,12 +5042,12 @@ fi bad_forward=no echo $ac_n "checking for bad static forward""... $ac_c" 1>&6 -echo "configure:5092: checking for bad static forward" >&5 +echo "configure:5046: 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 <<EOF -#line 5097 "configure" +#line 5051 "configure" #include "confdefs.h" struct s { int a; int b; }; @@ -5109,7 +5063,7 @@ main() { } EOF -if { (eval echo configure:5113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5128,9 +5082,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:5132: checking whether va_list is an array" >&5 +echo "configure:5086: checking whether va_list is an array" >&5 cat > conftest.$ac_ext <<EOF -#line 5134 "configure" +#line 5088 "configure" #include "confdefs.h" #ifdef HAVE_STDARG_PROTOTYPES @@ -5143,7 +5097,7 @@ int main() { va_list list1, list2; list1 = list2; ; return 0; } EOF -if { (eval echo configure:5147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5159,12 +5113,12 @@ echo "$ac_t""$va_list_is_array" 1>&6 # sigh -- gethostbyname_r is a mess; it can have 3, 5 or 6 arguments :-( echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:5163: checking for gethostbyname_r" >&5 -if eval "test \"\${ac_cv_func_gethostbyname_r+set}\" = set"; then +echo "configure:5117: checking for gethostbyname_r" >&5 +if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5168 "configure" +#line 5122 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname_r(); below. */ @@ -5173,7 +5127,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname_r(); -char (*f)(); int main() { @@ -5183,12 +5136,12 @@ int main() { #if defined (__stub_gethostbyname_r) || defined (__stub___gethostbyname_r) choke me #else -f = gethostbyname_r; +gethostbyname_r(); #endif ; return 0; } EOF -if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -5208,11 +5161,11 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then EOF echo $ac_n "checking gethostbyname_r with 6 args""... $ac_c" 1>&6 -echo "configure:5212: checking gethostbyname_r with 6 args" >&5 +echo "configure:5165: checking gethostbyname_r with 6 args" >&5 OLD_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS" cat > conftest.$ac_ext <<EOF -#line 5216 "configure" +#line 5169 "configure" #include "confdefs.h" # include <netdb.h> @@ -5229,7 +5182,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5249,9 +5202,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 5 args""... $ac_c" 1>&6 -echo "configure:5253: checking gethostbyname_r with 5 args" >&5 +echo "configure:5206: checking gethostbyname_r with 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5255 "configure" +#line 5208 "configure" #include "confdefs.h" # include <netdb.h> @@ -5268,7 +5221,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5288,9 +5241,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 3 args""... $ac_c" 1>&6 -echo "configure:5292: checking gethostbyname_r with 3 args" >&5 +echo "configure:5245: checking gethostbyname_r with 3 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5294 "configure" +#line 5247 "configure" #include "confdefs.h" # include <netdb.h> @@ -5305,7 +5258,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -5341,12 +5294,12 @@ else for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5345: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:5298: 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 <<EOF -#line 5350 "configure" +#line 5303 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5355,7 +5308,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -5365,12 +5317,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:5374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5326: \"$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 @@ -5408,12 +5360,12 @@ fi # Linux requires this for correct f.p. operations echo $ac_n "checking for __fpu_control""... $ac_c" 1>&6 -echo "configure:5412: checking for __fpu_control" >&5 -if eval "test \"\${ac_cv_func___fpu_control+set}\" = set"; then +echo "configure:5364: checking for __fpu_control" >&5 +if eval "test \"`echo '$''{'ac_cv_func___fpu_control'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5417 "configure" +#line 5369 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __fpu_control(); below. */ @@ -5422,7 +5374,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char __fpu_control(); -char (*f)(); int main() { @@ -5432,12 +5383,12 @@ int main() { #if defined (__stub___fpu_control) || defined (__stub_____fpu_control) choke me #else -f = __fpu_control; +__fpu_control(); #endif ; return 0; } EOF -if { (eval echo configure:5441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___fpu_control=yes" else @@ -5455,15 +5406,15 @@ if eval "test \"`echo '$ac_cv_func_'__fpu_control`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6 -echo "configure:5459: checking for __fpu_control in -lieee" >&5 +echo "configure:5410: checking for __fpu_control in -lieee" >&5 ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'` -if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <<EOF -#line 5467 "configure" +#line 5418 "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 @@ -5474,7 +5425,7 @@ int main() { __fpu_control() ; return 0; } EOF -if { (eval echo configure:5478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5429: \"$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 @@ -5507,7 +5458,7 @@ fi # Check for --with-fpectl echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6 -echo "configure:5511: checking for --with-fpectl" >&5 +echo "configure:5462: checking for --with-fpectl" >&5 # Check whether --with-fpectl or --without-fpectl was given. if test "${with_fpectl+set}" = set; then withval="$with_fpectl" @@ -5532,7 +5483,7 @@ BeOS) ;; *) LIBM=-lm esac echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6 -echo "configure:5536: checking for --with-libm=STRING" >&5 +echo "configure:5487: 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" @@ -5553,7 +5504,7 @@ fi # check for --with-libc=... echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6 -echo "configure:5557: checking for --with-libc=STRING" >&5 +echo "configure:5508: 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" @@ -5577,12 +5528,12 @@ LIBS="$LIBS $LIBM" for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5581: checking for $ac_func" >&5 -if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then +echo "configure:5532: 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 <<EOF -#line 5586 "configure" +#line 5537 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5591,7 +5542,6 @@ else /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char $ac_func(); -char (*f)(); int main() { @@ -5601,12 +5551,12 @@ int main() { #if defined (__stub_$ac_func) || defined (__stub___$ac_func) choke me #else -f = $ac_func; +$ac_func(); #endif ; return 0; } EOF -if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5560: \"$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 @@ -5636,15 +5586,15 @@ LIBS=$LIBS_SAVE # check for getopt echo $ac_n "checking for genuine getopt""... $ac_c" 1>&6 -echo "configure:5640: checking for genuine getopt" >&5 -if eval "test \"\${ac_cv_func_getopt+set}\" = set"; then +echo "configure:5590: 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 if test "$cross_compiling" = yes; then ac_cv_func_getopt=no else cat > conftest.$ac_ext <<EOF -#line 5648 "configure" +#line 5598 "configure" #include "confdefs.h" #include <stdio.h> extern int optind, opterr, getopt(); @@ -5656,7 +5606,7 @@ int main() { exit(0); } EOF -if { (eval echo configure:5660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5610: \"$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 @@ -5674,15 +5624,15 @@ 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:5678: checking what malloc(0) returns" >&5 -if eval "test \"\${ac_cv_malloc_zero+set}\" = set"; then +echo "configure:5628: 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 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 <<EOF -#line 5686 "configure" +#line 5636 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_STDLIB @@ -5701,7 +5651,7 @@ main() { exit(0); } EOF -if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5655: \"$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 @@ -5727,17 +5677,17 @@ fi # check for wchar.h ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 -echo "configure:5731: checking for wchar.h" >&5 -if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then +echo "configure:5681: checking for wchar.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5736 "configure" +#line 5686 "configure" #include "confdefs.h" #include <wchar.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5691: \"$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* @@ -5767,12 +5717,12 @@ fi # check for usable wchar_t usable_wchar_t="unkown" echo $ac_n "checking for usable wchar_t""... $ac_c" 1>&6 -echo "configure:5771: checking for usable wchar_t" >&5 +echo "configure:5721: checking for usable wchar_t" >&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 <<EOF -#line 5776 "configure" +#line 5726 "configure" #include "confdefs.h" #include "wchar.h" @@ -5786,7 +5736,7 @@ main() { } EOF -if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_USABLE_WCHAR_T 1 @@ -5805,14 +5755,14 @@ echo "$ac_t""$usable_wchar_t" 1>&6 # check for endianness echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:5809: checking whether byte ordering is bigendian" >&5 -if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then +echo "configure:5759: checking whether byte ordering is bigendian" >&5 +if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 5816 "configure" +#line 5766 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -5823,11 +5773,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:5827: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 5831 "configure" +#line 5781 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -5838,7 +5788,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:5842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -5858,7 +5808,7 @@ 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 <<EOF -#line 5862 "configure" +#line 5812 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -5871,7 +5821,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:5875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -5898,8 +5848,8 @@ fi # Check whether right shifting a negative integer extends the sign bit # or fills with zeros (like the Cray J90, according to Tim Peters). echo $ac_n "checking whether right shift extends the sign bit""... $ac_c" 1>&6 -echo "configure:5902: checking whether right shift extends the sign bit" >&5 -if eval "test \"\${ac_cv_rshift_extends_sign+set}\" = set"; then +echo "configure:5852: checking whether right shift extends the sign bit" >&5 +if eval "test \"`echo '$''{'ac_cv_rshift_extends_sign'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5907,7 +5857,7 @@ 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 <<EOF -#line 5911 "configure" +#line 5861 "configure" #include "confdefs.h" int main() @@ -5916,7 +5866,7 @@ int main() } EOF -if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_rshift_extends_sign=yes else @@ -5948,12 +5898,12 @@ cat >> confdefs.h <<\EOF #endif EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:5952: checking for socklen_t" >&5 -if eval "test \"\${ac_cv_type_socklen_t+set}\" = set"; then +echo "configure:5902: checking for socklen_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5957 "configure" +#line 5907 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5964,19 +5914,17 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "(^|[^a-zA-Z_0-9])socklen_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* - eval "ac_cv_type_socklen_t=yes" + ac_cv_type_socklen_t=yes else rm -rf conftest* - eval "ac_cv_type_socklen_t=no" + ac_cv_type_socklen_t=no fi rm -f conftest* fi -if eval "test \"`echo '$ac_cv_type_'socklen_t`\" = yes"; then - echo "$ac_t""yes" 1>&6 -else - echo "$ac_t""no" 1>&6 - cat >> confdefs.h <<EOF +echo "$ac_t""$ac_cv_type_socklen_t" 1>&6 +if test $ac_cv_type_socklen_t = no; then + cat >> confdefs.h <<\EOF #define socklen_t int EOF @@ -6074,7 +6022,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.14.1" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -6377,5 +6325,5 @@ exit 0 EOF chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 diff --git a/configure.in b/configure.in index d36f312..4dd8e72 100644 --- a/configure.in +++ b/configure.in @@ -745,6 +745,15 @@ else AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) AC_DEFINE(C_THREADS) LIBOBJS="$LIBOBJS thread.o"],[ + AC_MSG_CHECKING(for --with-pth) + AC_ARG_WITH(pth, + [ --with-pth use GNU pth threading libraries], [ + AC_MSG_RESULT($withval) + AC_DEFINE(WITH_THREAD) + AC_DEFINE(HAVE_PTH) + LIBS="-lpth $LIBS" + LIBOBJS="$LIBOBJS thread.o"],[ + AC_MSG_RESULT(no) AC_CHECK_LIB(pthread, pthread_create, [AC_DEFINE(WITH_THREAD) AC_DEFINE(_POSIX_THREADS) LIBS="-lpthread $LIBS" @@ -767,10 +776,6 @@ else AC_DEFINE(_POSIX_THREADS) LIBS="$LIBS -lthread" LIBOBJS="$LIBOBJS thread.o"], [ - AC_CHECK_LIB(pth, pth_init, [AC_DEFINE(WITH_THREAD) - AC_DEFINE(_GNU_PTH) - LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o"],[ AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD) AC_DEFINE(_POSIX_THREADS) LIBS="$LIBS -lcma" |