diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2002-04-05 16:50:53 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2002-04-05 16:50:53 (GMT) |
| commit | 2d7e264762b3345631015d3d74fc5db644410773 (patch) | |
| tree | ea94b980849cfd02f580f9519b3fad767c7fb9f2 | |
| parent | 4179a01bb72b9034d2de8d5644c5217b69aaf300 (diff) | |
| download | cpython-2d7e264762b3345631015d3d74fc5db644410773.zip cpython-2d7e264762b3345631015d3d74fc5db644410773.tar.gz cpython-2d7e264762b3345631015d3d74fc5db644410773.tar.bz2 | |
Eliminate use of LIBOBJS which is an error in autoconf 2.53.
| -rw-r--r-- | Makefile.pre.in | 4 | ||||
| -rwxr-xr-x | configure | 531 | ||||
| -rw-r--r-- | configure.in | 38 |
3 files changed, 281 insertions, 292 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 92f2f14..70260a7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -148,7 +148,7 @@ LIBC= @LIBC@ SYSLIBS= $(LIBM) $(LIBC) MAINOBJ= @MAINOBJ@ -LIBOBJS= @LIBOBJS@ +THREADOBJ= @THREADOBJ@ DLINCLDIR= @DLINCLDIR@ DYNLOADFILE= @DYNLOADFILE@ MACHDEP_OBJS= @MACHDEP_OBJS@ @@ -242,7 +242,7 @@ PYTHON_OBJS= \ Python/getopt.o \ Python/$(DYNLOADFILE) \ $(MACHDEP_OBJS) \ - $(LIBOBJS) + $(THREADOBJ) ########################################################################## @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.301 +# From configure.in Revision: 1.302 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -3746,6 +3746,7 @@ then with_threads="yes" fi echo "$ac_t""$with_threads" 1>&6 + if test "$with_threads" = "no" then USE_THREAD_MODULE="#" @@ -3761,7 +3762,7 @@ EOF EOF posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" elif test "$ac_cv_kpthread" = "yes" then CC="$CC -Kpthread" @@ -3770,7 +3771,7 @@ then EOF posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else if test ! -z "$with_threads" -a -d "$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads" @@ -3782,9 +3783,9 @@ else # According to the POSIX spec, a pthreads implementation must # define _POSIX_THREADS in unistd.h. Some apparently don't (which ones?) echo $ac_n "checking for _POSIX_THREADS in unistd.h""... $ac_c" 1>&6 -echo "configure:3786: checking for _POSIX_THREADS in unistd.h" >&5 +echo "configure:3787: checking for _POSIX_THREADS in unistd.h" >&5 cat > conftest.$ac_ext <<EOF -#line 3788 "configure" +#line 3789 "configure" #include "confdefs.h" #include <unistd.h> #ifdef _POSIX_THREADS @@ -3810,17 +3811,17 @@ EOF ac_safe=`echo "cthreads.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for cthreads.h""... $ac_c" 1>&6 -echo "configure:3814: checking for cthreads.h" >&5 +echo "configure:3815: checking for 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 3819 "configure" +#line 3820 "configure" #include "confdefs.h" #include <cthreads.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3825: \"$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* @@ -3849,23 +3850,23 @@ EOF EOF LIBS="$LIBS -lthreads" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6 -echo "configure:3859: checking for mach/cthreads.h" >&5 +echo "configure:3860: 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 3864 "configure" +#line 3865 "configure" #include "confdefs.h" #include <mach/cthreads.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3870: \"$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* @@ -3893,12 +3894,12 @@ EOF #define MACH_C_THREADS 1 EOF - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for --with-pth""... $ac_c" 1>&6 -echo "configure:3902: checking for --with-pth" >&5 +echo "configure:3903: checking for --with-pth" >&5 # Check whether --with-pth or --without-pth was given. if test "${with_pth+set}" = set; then withval="$with_pth" @@ -3913,7 +3914,7 @@ EOF EOF LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 @@ -3924,9 +3925,9 @@ else _libs=$LIBS LIBS="$LIBS -lpthread" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:3928: checking for pthread_create in -lpthread" >&5 +echo "configure:3929: checking for pthread_create in -lpthread" >&5 cat > conftest.$ac_ext <<EOF -#line 3930 "configure" +#line 3931 "configure" #include "confdefs.h" #include <pthread.h> @@ -3936,7 +3937,7 @@ int main() { pthread_create (NULL, NULL, start_routine, NULL) ; return 0; } EOF -if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -3945,7 +3946,7 @@ if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && t EOF posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -3953,12 +3954,12 @@ else LIBS=$_libs echo $ac_n "checking for pthread_detach""... $ac_c" 1>&6 -echo "configure:3957: checking for pthread_detach" >&5 +echo "configure:3958: 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 3962 "configure" +#line 3963 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_detach(); below. */ @@ -3981,7 +3982,7 @@ pthread_detach(); ; return 0; } EOF -if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3986: \"$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 @@ -4000,23 +4001,23 @@ if eval "test \"`echo '$ac_cv_func_'pthread_detach`\" = yes"; then EOF posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 ac_safe=`echo "kernel/OS.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for kernel/OS.h""... $ac_c" 1>&6 -echo "configure:4010: checking for kernel/OS.h" >&5 +echo "configure:4011: 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 4015 "configure" +#line 4016 "configure" #include "confdefs.h" #include <kernel/OS.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4021: \"$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* @@ -4040,12 +4041,12 @@ EOF #define BEOS_THREADS 1 EOF - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4049: checking for pthread_create in -lpthreads" >&5 +echo "configure:4050: checking for pthread_create in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4053,7 +4054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <<EOF -#line 4057 "configure" +#line 4058 "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 @@ -4064,7 +4065,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4069: \"$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 @@ -4085,12 +4086,12 @@ EOF posix_threads=yes LIBS="$LIBS -lpthreads" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4094: checking for pthread_create in -lc_r" >&5 +echo "configure:4095: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4098,7 +4099,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4102 "configure" +#line 4103 "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 @@ -4109,7 +4110,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4114: \"$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 @@ -4130,12 +4131,12 @@ EOF posix_threads=yes LIBS="$LIBS -lc_r" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6 -echo "configure:4139: checking for __d6_pthread_create in -lthread" >&5 +echo "configure:4140: checking for __d6_pthread_create in -lthread" >&5 ac_lib_var=`echo thread'_'__d6_pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4143,7 +4144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4147 "configure" +#line 4148 "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 @@ -4154,7 +4155,7 @@ int main() { __d6_pthread_create() ; return 0; } EOF -if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4159: \"$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 @@ -4175,12 +4176,12 @@ EOF posix_threads=yes LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 -echo "configure:4184: checking for __pthread_create_system in -lpthread" >&5 +echo "configure:4185: checking for __pthread_create_system in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4188,7 +4189,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4192 "configure" +#line 4193 "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 @@ -4199,7 +4200,7 @@ int main() { __pthread_create_system() ; return 0; } EOF -if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4204: \"$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 @@ -4220,12 +4221,12 @@ EOF posix_threads=yes LIBS="$LIBS -lpthread" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lcma""... $ac_c" 1>&6 -echo "configure:4229: checking for pthread_create in -lcma" >&5 +echo "configure:4230: checking for pthread_create in -lcma" >&5 ac_lib_var=`echo cma'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4233,7 +4234,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <<EOF -#line 4237 "configure" +#line 4238 "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 @@ -4244,7 +4245,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4249: \"$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 @@ -4265,7 +4266,7 @@ EOF posix_threads=yes LIBS="$LIBS -lcma" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else echo "$ac_t""no" 1>&6 @@ -4303,7 +4304,7 @@ EOF fi echo $ac_n "checking if PTHREAD_SCOPE_SYSTEM is supported""... $ac_c" 1>&6 -echo "configure:4307: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5 +echo "configure:4308: checking if PTHREAD_SCOPE_SYSTEM is supported" >&5 if eval "test \"`echo '$''{'ac_cv_pthread_system_supported'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4311,7 +4312,7 @@ else ac_cv_pthread_system_supported=no else cat > conftest.$ac_ext <<EOF -#line 4315 "configure" +#line 4316 "configure" #include "confdefs.h" #include <pthread.h> void *foo(void *parm) { @@ -4326,7 +4327,7 @@ else exit(0); } EOF -if { (eval echo configure:4330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_pthread_system_supported=yes else @@ -4351,12 +4352,12 @@ EOF for ac_func in pthread_sigmask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4355: checking for $ac_func" >&5 +echo "configure:4356: 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 4360 "configure" +#line 4361 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4379,7 +4380,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4384: \"$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 @@ -4406,7 +4407,7 @@ done fi echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6 -echo "configure:4410: checking for usconfig in -lmpc" >&5 +echo "configure:4411: checking for usconfig in -lmpc" >&5 ac_lib_var=`echo mpc'_'usconfig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4414,7 +4415,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4418 "configure" +#line 4419 "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 @@ -4425,7 +4426,7 @@ int main() { usconfig() ; return 0; } EOF -if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4430: \"$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 @@ -4445,7 +4446,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then EOF LIBS="$LIBS -lmpc" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" USE_THREAD_MODULE="" else echo "$ac_t""no" 1>&6 @@ -4454,7 +4455,7 @@ fi if test $posix_threads != "yes"; then echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:4458: checking for thr_create in -lthread" >&5 +echo "configure:4459: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4462,7 +4463,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4466 "configure" +#line 4467 "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 @@ -4473,7 +4474,7 @@ int main() { thr_create() ; return 0; } EOF -if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4478: \"$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 @@ -4493,7 +4494,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then EOF LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" USE_THREAD_MODULE="" else echo "$ac_t""no" 1>&6 @@ -4513,7 +4514,7 @@ fi # Check for enable-ipv6 echo $ac_n "checking if --enable-ipv6 is specified""... $ac_c" 1>&6 -echo "configure:4517: checking if --enable-ipv6 is specified" >&5 +echo "configure:4518: checking if --enable-ipv6 is specified" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" @@ -4538,7 +4539,7 @@ else else cat > conftest.$ac_ext <<EOF -#line 4542 "configure" +#line 4543 "configure" #include "confdefs.h" /* AF_INET6 available check */ #include <sys/types.h> @@ -4552,7 +4553,7 @@ main() } EOF -if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 ipv6=yes @@ -4569,9 +4570,9 @@ fi if test "$ipv6" = "yes"; then echo $ac_n "checking if RFC2553 API is available""... $ac_c" 1>&6 -echo "configure:4573: checking if RFC2553 API is available" >&5 +echo "configure:4574: checking if RFC2553 API is available" >&5 cat > conftest.$ac_ext <<EOF -#line 4575 "configure" +#line 4576 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -4580,7 +4581,7 @@ struct sockaddr_in6 x; x.sin6_scope_id; ; return 0; } EOF -if { (eval echo configure:4584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ipv6=yes @@ -4610,13 +4611,13 @@ ipv6trylibc=no if test "$ipv6" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:4614: checking ipv6 stack type" >&5 +echo "configure:4615: checking ipv6 stack type" >&5 for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta; do case $i in inria) cat > conftest.$ac_ext <<EOF -#line 4620 "configure" +#line 4621 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -4634,7 +4635,7 @@ rm -f conftest* ;; kame) cat > conftest.$ac_ext <<EOF -#line 4638 "configure" +#line 4639 "configure" #include "confdefs.h" #include <netinet/in.h> @@ -4655,7 +4656,7 @@ rm -f conftest* ;; linux-glibc) cat > conftest.$ac_ext <<EOF -#line 4659 "configure" +#line 4660 "configure" #include "confdefs.h" #include <features.h> @@ -4690,7 +4691,7 @@ rm -f conftest* ;; toshiba) cat > conftest.$ac_ext <<EOF -#line 4694 "configure" +#line 4695 "configure" #include "confdefs.h" #include <sys/param.h> @@ -4710,7 +4711,7 @@ rm -f conftest* ;; v6d) cat > conftest.$ac_ext <<EOF -#line 4714 "configure" +#line 4715 "configure" #include "confdefs.h" #include </usr/local/v6/include/sys/v6config.h> @@ -4731,7 +4732,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext <<EOF -#line 4735 "configure" +#line 4736 "configure" #include "confdefs.h" #include <sys/param.h> @@ -4775,7 +4776,7 @@ fi # Check for GC support echo $ac_n "checking for --with-cycle-gc""... $ac_c" 1>&6 -echo "configure:4779: checking for --with-cycle-gc" >&5 +echo "configure:4780: 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" @@ -4797,7 +4798,7 @@ echo "$ac_t""$with_cycle_gc" 1>&6 # Check for Python-specific malloc support echo $ac_n "checking for --with-pymalloc""... $ac_c" 1>&6 -echo "configure:4801: checking for --with-pymalloc" >&5 +echo "configure:4802: checking for --with-pymalloc" >&5 # Check whether --with-pymalloc or --without-pymalloc was given. if test "${with_pymalloc+set}" = set; then withval="$with_pymalloc" @@ -4819,7 +4820,7 @@ echo "$ac_t""$with_pymalloc" 1>&6 # Check for --with-wctype-functions echo $ac_n "checking for --with-wctype-functions""... $ac_c" 1>&6 -echo "configure:4823: checking for --with-wctype-functions" >&5 +echo "configure:4824: 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" @@ -4841,7 +4842,7 @@ fi DLINCLDIR=. echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6 -echo "configure:4845: checking for --with-sgi-dl" >&5 +echo "configure:4846: 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" @@ -4865,7 +4866,7 @@ fi echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6 -echo "configure:4869: checking for --with-dl-dld" >&5 +echo "configure:4870: 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" @@ -4894,12 +4895,12 @@ fi for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4898: checking for $ac_func" >&5 +echo "configure:4899: 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 4903 "configure" +#line 4904 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4922,7 +4923,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4927: \"$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 @@ -4951,7 +4952,7 @@ done # loading of modules. echo $ac_n "checking DYNLOADFILE""... $ac_c" 1>&6 -echo "configure:4955: checking DYNLOADFILE" >&5 +echo "configure:4956: checking DYNLOADFILE" >&5 if test -z "$DYNLOADFILE" then case $ac_sys_system/$ac_sys_release in @@ -4982,7 +4983,7 @@ fi echo $ac_n "checking MACHDEP_OBJS""... $ac_c" 1>&6 -echo "configure:4986: checking MACHDEP_OBJS" >&5 +echo "configure:4987: checking MACHDEP_OBJS" >&5 if test -z "$MACHDEP_OBJS" then MACHDEP_OBJS=$extra_machdep_objs @@ -5005,12 +5006,12 @@ for ac_func in alarm chown chroot clock confstr ctermid ctermid_r execv \ truncate uname unsetenv waitpid _getpty getpriority do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5009: checking for $ac_func" >&5 +echo "configure:5010: 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 5014 "configure" +#line 5015 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5033,7 +5034,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5038: \"$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 @@ -5063,12 +5064,12 @@ done for ac_func in openpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5067: checking for $ac_func" >&5 +echo "configure:5068: 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 5072 "configure" +#line 5073 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5091,7 +5092,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5096: \"$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 @@ -5113,7 +5114,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:5117: checking for openpty in -lutil" >&5 +echo "configure:5118: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5121,7 +5122,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 5125 "configure" +#line 5126 "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 @@ -5132,7 +5133,7 @@ int main() { openpty() ; return 0; } EOF -if { (eval echo configure:5136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5137: \"$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 @@ -5161,12 +5162,12 @@ done for ac_func in forkpty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5165: checking for $ac_func" >&5 +echo "configure:5166: 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 5170 "configure" +#line 5171 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5189,7 +5190,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5194: \"$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 @@ -5211,7 +5212,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for forkpty in -lutil""... $ac_c" 1>&6 -echo "configure:5215: checking for forkpty in -lutil" >&5 +echo "configure:5216: checking for forkpty in -lutil" >&5 ac_lib_var=`echo util'_'forkpty | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5219,7 +5220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 5223 "configure" +#line 5224 "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 @@ -5230,7 +5231,7 @@ int main() { forkpty() ; return 0; } EOF -if { (eval echo configure:5234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5235: \"$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 @@ -5261,12 +5262,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:5265: checking for $ac_func" >&5 +echo "configure:5266: 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 5270 "configure" +#line 5271 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5289,7 +5290,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5294: \"$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 @@ -5317,12 +5318,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:5321: checking for $ac_func" >&5 +echo "configure:5322: 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 5326 "configure" +#line 5327 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5345,7 +5346,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5350: \"$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 @@ -5374,12 +5375,12 @@ done for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5378: checking for $ac_func" >&5 +echo "configure:5379: 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 5383 "configure" +#line 5384 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5402,7 +5403,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5407: \"$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 @@ -5421,14 +5422,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5425 "configure" +#line 5426 "configure" #include "confdefs.h" #include <unistd.h> int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:5432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define GETPGRP_HAVE_ARG 1 @@ -5447,12 +5448,12 @@ done for ac_func in setpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5451: checking for $ac_func" >&5 +echo "configure:5452: 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 5456 "configure" +#line 5457 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5475,7 +5476,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5480: \"$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 @@ -5494,14 +5495,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5498 "configure" +#line 5499 "configure" #include "confdefs.h" #include <unistd.h> int main() { setpgrp(0,0); ; return 0; } EOF -if { (eval echo configure:5505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SETPGRP_HAVE_ARG 1 @@ -5520,12 +5521,12 @@ done for ac_func in gettimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5524: checking for $ac_func" >&5 +echo "configure:5525: 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 5529 "configure" +#line 5530 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5548,7 +5549,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5553: \"$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 @@ -5567,14 +5568,14 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 5571 "configure" +#line 5572 "configure" #include "confdefs.h" #include <sys/time.h> int main() { gettimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:5578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5596,9 +5597,9 @@ done # On OSF/1 V5.1, getaddrinfo is available, but a define # for [no]getaddrinfo in netdb.h. echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:5600: checking for getaddrinfo" >&5 +echo "configure:5601: checking for getaddrinfo" >&5 cat > conftest.$ac_ext <<EOF -#line 5602 "configure" +#line 5603 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5612,18 +5613,18 @@ getaddrinfo(NULL, NULL, NULL, NULL); ; return 0; } EOF -if { (eval echo configure:5616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 echo $ac_n "checking getaddrinfo bug""... $ac_c" 1>&6 -echo "configure:5621: checking getaddrinfo bug" >&5 +echo "configure:5622: checking getaddrinfo bug" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""buggy" 1>&6 buggygetaddrinfo=yes else cat > conftest.$ac_ext <<EOF -#line 5627 "configure" +#line 5628 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5712,7 +5713,7 @@ main() } EOF -if { (eval echo configure:5716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""good" 1>&6 buggygetaddrinfo=no @@ -5752,12 +5753,12 @@ fi for ac_func in getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5756: checking for $ac_func" >&5 +echo "configure:5757: 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 5761 "configure" +#line 5762 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5780,7 +5781,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5785: \"$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 @@ -5807,12 +5808,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:5811: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5812: 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 5816 "configure" +#line 5817 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -5821,7 +5822,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5842,12 +5843,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5846: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5847: 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 5851 "configure" +#line 5852 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5855,7 +5856,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5876,12 +5877,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5880: checking for tm_zone in struct tm" >&5 +echo "configure:5881: 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 5885 "configure" +#line 5886 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -5889,7 +5890,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5909,12 +5910,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5913: checking for tzname" >&5 +echo "configure:5914: 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 5918 "configure" +#line 5919 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -5924,7 +5925,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5946,12 +5947,12 @@ EOF fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:5950: checking for st_rdev in struct stat" >&5 +echo "configure:5951: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5955 "configure" +#line 5956 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5959,7 +5960,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -5980,12 +5981,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5984: checking for st_blksize in struct stat" >&5 +echo "configure:5985: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5989 "configure" +#line 5990 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -5993,7 +5994,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -6014,12 +6015,12 @@ EOF fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:6018: checking for st_blocks in struct stat" >&5 +echo "configure:6019: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6023 "configure" +#line 6024 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -6027,7 +6028,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:6031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -6051,19 +6052,19 @@ fi echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6 -echo "configure:6055: checking for time.h that defines altzone" >&5 +echo "configure:6056: 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 6060 "configure" +#line 6061 "configure" #include "confdefs.h" #include <time.h> int main() { return altzone; ; return 0; } EOF -if { (eval echo configure:6067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time_altzone=yes else @@ -6085,9 +6086,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:6089: checking whether sys/select.h and sys/time.h may both be included" >&5 +echo "configure:6090: checking whether sys/select.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext <<EOF -#line 6091 "configure" +#line 6092 "configure" #include "confdefs.h" #include <sys/types.h> @@ -6098,7 +6099,7 @@ int main() { ; ; return 0; } EOF -if { (eval echo configure:6102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SYS_SELECT_WITH_SYS_TIME 1 @@ -6112,12 +6113,12 @@ rm -f conftest* echo "$ac_t""$was_it_defined" 1>&6 echo $ac_n "checking for addrinfo""... $ac_c" 1>&6 -echo "configure:6116: checking for addrinfo" >&5 +echo "configure:6117: checking for addrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_struct_addrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6121 "configure" +#line 6122 "configure" #include "confdefs.h" # include <netdb.h> @@ -6125,7 +6126,7 @@ int main() { struct addrinfo a ; return 0; } EOF -if { (eval echo configure:6129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_addrinfo=yes else @@ -6146,12 +6147,12 @@ EOF fi echo $ac_n "checking for sockaddr_storage""... $ac_c" 1>&6 -echo "configure:6150: checking for sockaddr_storage" >&5 +echo "configure:6151: checking for sockaddr_storage" >&5 if eval "test \"`echo '$''{'ac_cv_struct_sockaddr_storage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6155 "configure" +#line 6156 "configure" #include "confdefs.h" # include <sys/types.h> @@ -6160,7 +6161,7 @@ int main() { struct sockaddr_storage s ; return 0; } EOF -if { (eval echo configure:6164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_sockaddr_storage=yes else @@ -6183,14 +6184,14 @@ fi # checks for compiler characteristics echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:6187: checking whether char is unsigned" >&5 +echo "configure:6188: 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 6194 "configure" +#line 6195 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -6212,7 +6213,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 6216 "configure" +#line 6217 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -6222,7 +6223,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:6226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6227: \"$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 @@ -6246,12 +6247,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6250: checking for working const" >&5 +echo "configure:6251: 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 6255 "configure" +#line 6256 "configure" #include "confdefs.h" int main() { @@ -6300,7 +6301,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:6304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6323,16 +6324,16 @@ fi works=no echo $ac_n "checking for working volatile""... $ac_c" 1>&6 -echo "configure:6327: checking for working volatile" >&5 +echo "configure:6328: checking for working volatile" >&5 cat > conftest.$ac_ext <<EOF -#line 6329 "configure" +#line 6330 "configure" #include "confdefs.h" int main() { volatile int x; x = 0; ; return 0; } EOF -if { (eval echo configure:6336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -6349,16 +6350,16 @@ echo "$ac_t""$works" 1>&6 works=no echo $ac_n "checking for working signed char""... $ac_c" 1>&6 -echo "configure:6353: checking for working signed char" >&5 +echo "configure:6354: checking for working signed char" >&5 cat > conftest.$ac_ext <<EOF -#line 6355 "configure" +#line 6356 "configure" #include "confdefs.h" int main() { signed char c; ; return 0; } EOF -if { (eval echo configure:6362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* works=yes else @@ -6375,16 +6376,16 @@ echo "$ac_t""$works" 1>&6 have_prototypes=no echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:6379: checking for prototypes" >&5 +echo "configure:6380: checking for prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 6381 "configure" +#line 6382 "configure" #include "confdefs.h" int foo(int x) { return 0; } int main() { return foo(10); ; return 0; } EOF -if { (eval echo configure:6388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_PROTOTYPES 1 @@ -6399,9 +6400,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:6403: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:6404: checking for variable length prototypes and stdarg.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6405 "configure" +#line 6406 "configure" #include "confdefs.h" #include <stdarg.h> @@ -6418,7 +6419,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:6422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STDARG_PROTOTYPES 1 @@ -6434,16 +6435,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:6438: checking for bad exec* prototypes" >&5 +echo "configure:6439: checking for bad exec* prototypes" >&5 cat > conftest.$ac_ext <<EOF -#line 6440 "configure" +#line 6441 "configure" #include "confdefs.h" #include <unistd.h> int main() { char **t;execve("@",t,t); ; return 0; } EOF -if { (eval echo configure:6447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6460,9 +6461,9 @@ fi # check if sockaddr has sa_len member echo $ac_n "checking if sockaddr has sa_len member""... $ac_c" 1>&6 -echo "configure:6464: checking if sockaddr has sa_len member" >&5 +echo "configure:6465: checking if sockaddr has sa_len member" >&5 cat > conftest.$ac_ext <<EOF -#line 6466 "configure" +#line 6467 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> @@ -6471,7 +6472,7 @@ struct sockaddr x; x.sa_len = 0; ; return 0; } EOF -if { (eval echo configure:6475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -6487,7 +6488,7 @@ fi rm -f conftest* echo $ac_n "checking for bad static forward""... $ac_c" 1>&6 -echo "configure:6491: checking for bad static forward" >&5 +echo "configure:6492: checking for bad static forward" >&5 if eval "test \"`echo '$''{'ac_cv_bad_static_forward'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6495,7 +6496,7 @@ else ac_cv_bad_static_forward=no else cat > conftest.$ac_ext <<EOF -#line 6499 "configure" +#line 6500 "configure" #include "confdefs.h" struct s { int a; int b; }; @@ -6510,7 +6511,7 @@ main() { exit(!((int)&foo == foobar())); } EOF -if { (eval echo configure:6514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_bad_static_forward=no else @@ -6535,9 +6536,9 @@ fi va_list_is_array=no echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6 -echo "configure:6539: checking whether va_list is an array" >&5 +echo "configure:6540: checking whether va_list is an array" >&5 cat > conftest.$ac_ext <<EOF -#line 6541 "configure" +#line 6542 "configure" #include "confdefs.h" #ifdef HAVE_STDARG_PROTOTYPES @@ -6550,7 +6551,7 @@ int main() { va_list list1, list2; list1 = list2; ; return 0; } EOF -if { (eval echo configure:6554: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6566,12 +6567,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:6570: checking for gethostbyname_r" >&5 +echo "configure:6571: 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 6575 "configure" +#line 6576 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname_r(); below. */ @@ -6594,7 +6595,7 @@ gethostbyname_r(); ; return 0; } EOF -if { (eval echo configure:6598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6599: \"$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 @@ -6614,11 +6615,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:6618: checking gethostbyname_r with 6 args" >&5 +echo "configure:6619: 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 6622 "configure" +#line 6623 "configure" #include "confdefs.h" # include <netdb.h> @@ -6635,7 +6636,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6655,9 +6656,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 5 args""... $ac_c" 1>&6 -echo "configure:6659: checking gethostbyname_r with 5 args" >&5 +echo "configure:6660: checking gethostbyname_r with 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 6661 "configure" +#line 6662 "configure" #include "confdefs.h" # include <netdb.h> @@ -6674,7 +6675,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6694,9 +6695,9 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking gethostbyname_r with 3 args""... $ac_c" 1>&6 -echo "configure:6698: checking gethostbyname_r with 3 args" >&5 +echo "configure:6699: checking gethostbyname_r with 3 args" >&5 cat > conftest.$ac_ext <<EOF -#line 6700 "configure" +#line 6701 "configure" #include "confdefs.h" # include <netdb.h> @@ -6711,7 +6712,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -6747,12 +6748,12 @@ else for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6751: checking for $ac_func" >&5 +echo "configure:6752: 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 6756 "configure" +#line 6757 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6775,7 +6776,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6780: \"$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 @@ -6813,12 +6814,12 @@ fi # Linux requires this for correct f.p. operations echo $ac_n "checking for __fpu_control""... $ac_c" 1>&6 -echo "configure:6817: checking for __fpu_control" >&5 +echo "configure:6818: 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 6822 "configure" +#line 6823 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char __fpu_control(); below. */ @@ -6841,7 +6842,7 @@ __fpu_control(); ; return 0; } EOF -if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6846: \"$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 @@ -6859,7 +6860,7 @@ 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:6863: checking for __fpu_control in -lieee" >&5 +echo "configure:6864: checking for __fpu_control in -lieee" >&5 ac_lib_var=`echo ieee'_'__fpu_control | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6867,7 +6868,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lieee $LIBS" cat > conftest.$ac_ext <<EOF -#line 6871 "configure" +#line 6872 "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 @@ -6878,7 +6879,7 @@ int main() { __fpu_control() ; return 0; } EOF -if { (eval echo configure:6882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6883: \"$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 @@ -6911,7 +6912,7 @@ fi # Check for --with-fpectl echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6 -echo "configure:6915: checking for --with-fpectl" >&5 +echo "configure:6916: checking for --with-fpectl" >&5 # Check whether --with-fpectl or --without-fpectl was given. if test "${with_fpectl+set}" = set; then withval="$with_fpectl" @@ -6936,7 +6937,7 @@ BeOS) ;; *) LIBM=-lm esac echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6 -echo "configure:6940: checking for --with-libm=STRING" >&5 +echo "configure:6941: 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" @@ -6957,7 +6958,7 @@ fi # check for --with-libc=... echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6 -echo "configure:6961: checking for --with-libc=STRING" >&5 +echo "configure:6962: 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" @@ -6981,12 +6982,12 @@ LIBS="$LIBS $LIBM" for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6985: checking for $ac_func" >&5 +echo "configure:6986: 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 6990 "configure" +#line 6991 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7009,7 +7010,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7014: \"$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 @@ -7039,7 +7040,7 @@ LIBS=$LIBS_SAVE # check whether malloc(0) returns NULL or not echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6 -echo "configure:7043: checking what malloc(0) returns" >&5 +echo "configure:7044: 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 @@ -7047,7 +7048,7 @@ else ac_cv_malloc_zero=nonnull else cat > conftest.$ac_ext <<EOF -#line 7051 "configure" +#line 7052 "configure" #include "confdefs.h" #include <stdio.h> #ifdef HAVE_STDLIB @@ -7066,7 +7067,7 @@ main() { exit(0); } EOF -if { (eval echo configure:7070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7071: \"$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 @@ -7092,17 +7093,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:7096: checking for wchar.h" >&5 +echo "configure:7097: 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 7101 "configure" +#line 7102 "configure" #include "confdefs.h" #include <wchar.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7107: \"$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* @@ -7133,7 +7134,7 @@ fi if test "$wchar_h" = yes then echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:7137: checking size of wchar_t" >&5 +echo "configure:7138: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7141,7 +7142,7 @@ else ac_cv_sizeof_wchar_t=4 else cat > conftest.$ac_ext <<EOF -#line 7145 "configure" +#line 7146 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -7152,7 +7153,7 @@ main() exit(0); } EOF -if { (eval echo configure:7156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_wchar_t=`cat conftestval` else @@ -7174,7 +7175,7 @@ EOF fi echo $ac_n "checking what type to use for unicode""... $ac_c" 1>&6 -echo "configure:7178: checking what type to use for unicode" >&5 +echo "configure:7179: checking what type to use for unicode" >&5 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then enableval="$enable_unicode" @@ -7249,14 +7250,14 @@ fi # check for endianness echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:7253: checking whether byte ordering is bigendian" >&5 +echo "configure:7254: 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 7260 "configure" +#line 7261 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7267,11 +7268,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7272: \"$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 7275 "configure" +#line 7276 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -7282,7 +7283,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:7286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -7302,7 +7303,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 7306 "configure" +#line 7307 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -7315,7 +7316,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:7319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7320: \"$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 @@ -7342,7 +7343,7 @@ 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:7346: checking whether right shift extends the sign bit" >&5 +echo "configure:7347: 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 @@ -7351,7 +7352,7 @@ if test "$cross_compiling" = yes; then ac_cv_rshift_extends_sign=yes else cat > conftest.$ac_ext <<EOF -#line 7355 "configure" +#line 7356 "configure" #include "confdefs.h" int main() @@ -7360,7 +7361,7 @@ int main() } EOF -if { (eval echo configure:7364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7365: \"$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 @@ -7385,13 +7386,13 @@ fi # check for getc_unlocked and related locking functions echo $ac_n "checking for getc_unlocked() and friends""... $ac_c" 1>&6 -echo "configure:7389: checking for getc_unlocked() and friends" >&5 +echo "configure:7390: checking for getc_unlocked() and friends" >&5 if eval "test \"`echo '$''{'ac_cv_have_getc_unlocked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7395 "configure" +#line 7396 "configure" #include "confdefs.h" #include <stdio.h> int main() { @@ -7403,7 +7404,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_getc_unlocked=yes else @@ -7426,7 +7427,7 @@ fi # check for readline 4.0 echo $ac_n "checking for rl_pre_input_hook in -lreadline""... $ac_c" 1>&6 -echo "configure:7430: checking for rl_pre_input_hook in -lreadline" >&5 +echo "configure:7431: checking for rl_pre_input_hook in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_pre_input_hook | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7434,7 +7435,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7438 "configure" +#line 7439 "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 @@ -7445,7 +7446,7 @@ int main() { rl_pre_input_hook() ; return 0; } EOF -if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7450: \"$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 @@ -7471,7 +7472,7 @@ fi # check for readline 4.2 echo $ac_n "checking for rl_completion_matches in -lreadline""... $ac_c" 1>&6 -echo "configure:7475: checking for rl_completion_matches in -lreadline" >&5 +echo "configure:7476: checking for rl_completion_matches in -lreadline" >&5 ac_lib_var=`echo readline'_'rl_completion_matches | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7479,7 +7480,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline -ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 7483 "configure" +#line 7484 "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 @@ -7490,7 +7491,7 @@ int main() { rl_completion_matches() ; return 0; } EOF -if { (eval echo configure:7494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7495: \"$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 @@ -7515,7 +7516,7 @@ fi echo $ac_n "checking for broken nice()""... $ac_c" 1>&6 -echo "configure:7519: checking for broken nice()" >&5 +echo "configure:7520: checking for broken nice()" >&5 if eval "test \"`echo '$''{'ac_cv_broken_nice'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7524,7 +7525,7 @@ if test "$cross_compiling" = yes; then ac_cv_broken_nice=no else cat > conftest.$ac_ext <<EOF -#line 7528 "configure" +#line 7529 "configure" #include "confdefs.h" int main() @@ -7536,7 +7537,7 @@ int main() } EOF -if { (eval echo configure:7540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_broken_nice=yes else @@ -7561,12 +7562,12 @@ fi # On HP/UX 11.0, mvwdelch is a block with a return statement echo $ac_n "checking whether mvwdelch is an expression""... $ac_c" 1>&6 -echo "configure:7565: checking whether mvwdelch is an expression" >&5 +echo "configure:7566: checking whether mvwdelch is an expression" >&5 if eval "test \"`echo '$''{'ac_cv_mvwdelch_is_expression'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7570 "configure" +#line 7571 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7576,7 +7577,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mvwdelch_is_expression=yes else @@ -7599,12 +7600,12 @@ EOF fi echo $ac_n "checking whether WINDOW has _flags""... $ac_c" 1>&6 -echo "configure:7603: checking whether WINDOW has _flags" >&5 +echo "configure:7604: checking whether WINDOW has _flags" >&5 if eval "test \"`echo '$''{'ac_cv_window_has_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7608 "configure" +#line 7609 "configure" #include "confdefs.h" #include <curses.h> int main() { @@ -7614,7 +7615,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_window_has_flags=yes else @@ -7645,12 +7646,12 @@ cat >> confdefs.h <<\EOF #endif EOF echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:7649: checking for socklen_t" >&5 +echo "configure:7650: 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 7654 "configure" +#line 7655 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -7678,13 +7679,6 @@ EOF fi -# Add Python/ prefix to LIBOBJS -libobjs=$LIBOBJS -LIBOBJS= -for obj in $libobjs; do - LIBOBJS="$LIBOBJS Python/$obj" -done - #AC_MSG_CHECKING(for Modules/Setup) #if test ! -f Modules/Setup ; then # if test ! -d Modules ; then @@ -7706,7 +7700,7 @@ done SRCDIRS="Parser Grammar Objects Python Modules" echo $ac_n "checking for build directories""... $ac_c" 1>&6 -echo "configure:7710: checking for build directories" >&5 +echo "configure:7704: checking for build directories" >&5 for dir in $SRCDIRS; do if test ! -d $dir; then mkdir $dir @@ -7889,6 +7883,7 @@ s%@USE_SIGNAL_MODULE@%$USE_SIGNAL_MODULE%g s%@SIGNAL_OBJS@%$SIGNAL_OBJS%g s%@USE_THREAD_MODULE@%$USE_THREAD_MODULE%g s%@LDLAST@%$LDLAST%g +s%@THREADOBJ@%$THREADOBJ%g s%@DLINCLDIR@%$DLINCLDIR%g s%@DYNLOADFILE@%$DYNLOADFILE%g s%@MACHDEP_OBJS@%$MACHDEP_OBJS%g diff --git a/configure.in b/configure.in index 10b5e89..09a33cf 100644 --- a/configure.in +++ b/configure.in @@ -1050,6 +1050,7 @@ then with_threads="yes" fi AC_MSG_RESULT($with_threads) +AC_SUBST(THREADOBJ) if test "$with_threads" = "no" then USE_THREAD_MODULE="#" @@ -1059,13 +1060,13 @@ then # Defining _REENTRANT on system with POSIX threads should not hurt. AC_DEFINE(_REENTRANT) posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" elif test "$ac_cv_kpthread" = "yes" then CC="$CC -Kpthread" AC_DEFINE(WITH_THREAD) posix_threads=yes - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" else if test ! -z "$with_threads" -a -d "$with_threads" then LDFLAGS="$LDFLAGS -L$with_threads" @@ -1090,11 +1091,11 @@ else AC_DEFINE(C_THREADS) AC_DEFINE(HURD_C_THREADS) LIBS="$LIBS -lthreads" - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ AC_CHECK_HEADER(mach/cthreads.h, [AC_DEFINE(WITH_THREAD) AC_DEFINE(C_THREADS) AC_DEFINE(MACH_C_THREADS) - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ AC_MSG_CHECKING(for --with-pth) AC_ARG_WITH(pth, [ --with-pth use GNU pth threading libraries], [ @@ -1102,7 +1103,7 @@ else AC_DEFINE(WITH_THREAD) AC_DEFINE(HAVE_PTH) LIBS="-lpth $LIBS" - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ AC_MSG_RESULT(no) # Just looking for pthread_create in libpthread is not enough: @@ -1118,34 +1119,34 @@ pthread_create (NULL, NULL, start_routine, NULL)], [ AC_MSG_RESULT(yes) AC_DEFINE(WITH_THREAD) posix_threads=yes - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ LIBS=$_libs AC_CHECK_FUNC(pthread_detach, [AC_DEFINE(WITH_THREAD) posix_threads=yes - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ AC_CHECK_HEADER(kernel/OS.h, [AC_DEFINE(WITH_THREAD) AC_DEFINE(BEOS_THREADS) - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ AC_CHECK_LIB(pthreads, pthread_create, [AC_DEFINE(WITH_THREAD) posix_threads=yes LIBS="$LIBS -lpthreads" - LIBOBJS="$LIBOBJS thread.o"], [ + THREADOBJ="Python/thread.o"], [ AC_CHECK_LIB(c_r, pthread_create, [AC_DEFINE(WITH_THREAD) posix_threads=yes LIBS="$LIBS -lc_r" - LIBOBJS="$LIBOBJS thread.o"], [ + THREADOBJ="Python/thread.o"], [ AC_CHECK_LIB(thread, __d6_pthread_create, [AC_DEFINE(WITH_THREAD) posix_threads=yes LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o"], [ + THREADOBJ="Python/thread.o"], [ AC_CHECK_LIB(pthread, __pthread_create_system, [AC_DEFINE(WITH_THREAD) posix_threads=yes LIBS="$LIBS -lpthread" - LIBOBJS="$LIBOBJS thread.o"], [ + THREADOBJ="Python/thread.o"], [ AC_CHECK_LIB(cma, pthread_create, [AC_DEFINE(WITH_THREAD) posix_threads=yes LIBS="$LIBS -lcma" - LIBOBJS="$LIBOBJS thread.o"],[ + THREADOBJ="Python/thread.o"],[ USE_THREAD_MODULE="#"]) ])])])])])])])])])]) @@ -1181,13 +1182,13 @@ pthread_create (NULL, NULL, start_routine, NULL)], [ AC_CHECK_LIB(mpc, usconfig, [AC_DEFINE(WITH_THREAD) LIBS="$LIBS -lmpc" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" USE_THREAD_MODULE=""]) if test $posix_threads != "yes"; then AC_CHECK_LIB(thread, thr_create, [AC_DEFINE(WITH_THREAD) LIBS="$LIBS -lthread" - LIBOBJS="$LIBOBJS thread.o" + THREADOBJ="Python/thread.o" USE_THREAD_MODULE=""]) fi @@ -2086,13 +2087,6 @@ cat >> confdefs.h <<\EOF EOF AC_CHECK_TYPE(socklen_t, int) -# Add Python/ prefix to LIBOBJS -libobjs=$LIBOBJS -LIBOBJS= -for obj in $libobjs; do - LIBOBJS="$LIBOBJS Python/$obj" -done - #AC_MSG_CHECKING(for Modules/Setup) #if test ! -f Modules/Setup ; then # if test ! -d Modules ; then |