Make dynamicly loaded modules work on NetBSD/alpha. May work on

NetBSD/mips, if its ELF dlopen support is non-broken. Anyone willing to
test this, please get in touch with me.

Also, add more recent patches from python.org

3 files changed, 1150 insertions, 20 deletions

diff --git a/lang/python/Makefile b/lang/python/Makefile
index 6f19b5767f0..89bec5c09bd 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1998/09/02 22:32:23 tron Exp $
+# $NetBSD: Makefile,v 1.11 1998/09/20 20:28:11 tsarna Exp $
 #
 
 DISTNAME=	pyth151
@@ -16,7 +16,9 @@ PATCHFILES= 	freeze.1.txt _tkinter.1.txt configure.1.txt \
 		configure.2.txt imaplib.1.txt urllib.2.txt \
 		sgmllib.1.txt bltinmodule.2.txt ceval.1.txt gzip.1.txt \
 		imaplib.2.txt import.1.txt imaplib.3.txt \
-		stringobject.1.txt sgmllib.2.txt
+		stringobject.1.txt sgmllib.2.txt classobject.1.txt \
+		SocketServer.1.txt bltinmodule.3.txt longobject.1.txt \
+		stropmodule.1.txt
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.python.org/
@@ -29,10 +31,10 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 #   - disable some modules on 64 bit platforms
 #   - handle machines with no dynamic loader
 
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
 NO64BIT=\#
 .endif
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
 NOSHARED=\#
 .endif
 
diff --git a/lang/python/files/md5 b/lang/python/files/md5
index f6d13263ddb..bcdb1f6fe77 100644
--- a/lang/python/files/md5
+++ b/lang/python/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.5 1998/09/02 22:32:24 tron Exp $
+$NetBSD: md5,v 1.6 1998/09/20 20:28:11 tsarna Exp $
 
 MD5 (python/pyth151.tgz) = eb8ef6e37e543058a2d47996ecf62427
 MD5 (python/freeze.1.txt) = 7cb9266ba6db670cd019cf27c77468ef
@@ -25,3 +25,8 @@ MD5 (python/import.1.txt) = 15ab480458410b0450b07f3eedb15cda
 MD5 (python/imaplib.3.txt) = 3a8180096777c690c5ffd8c4fbd6c38b
 MD5 (python/stringobject.1.txt) = d1ccf56c0db0ba1df715ce55a5788ed3
 MD5 (python/sgmllib.2.txt) = 0ad52d457fbc84fbffe5b7b984e3d8d4
+MD5 (python/classobject.1.txt) = f65618df540a8819299b65eafe775e6a
+MD5 (python/SocketServer.1.txt) = 7ad43e38616efa28b28710e686462494
+MD5 (python/bltinmodule.3.txt) = 7ebef8ec99284c743ae4804638780bd7
+MD5 (python/longobject.1.txt) = 069fe0a8fdeaa60a8cf5ff68877a66a3
+MD5 (python/stropmodule.1.txt) = 0f7729796b64cfdf7ad63d74e95fac9d
diff --git a/lang/python/patches/patch-ba b/lang/python/patches/patch-ba
index 4603de54022..74aebdc0147 100644
--- a/lang/python/patches/patch-ba
+++ b/lang/python/patches/patch-ba
@@ -1,30 +1,1153 @@
-$NetBSD: patch-ba,v 1.1 1998/07/11 20:33:15 tsarna Exp $
+$NetBSD: patch-ba,v 1.2 1998/09/20 20:28:12 tsarna Exp $
 
-Use -fPIC so things don't break if they get too big (like py-Numeric on
-sparc). This setting is inherited by most py-* packages via the Python
-module-building system.
-
-Sent to GvR <guido@cnri.reston.va.us>
-
---- configure.orig	Fri Jul 10 19:40:07 1998
-+++ configure	Fri Jul 10 19:45:52 1998
-@@ -1861,7 +1861,7 @@
+--- configure.in.orig	Thu Aug 27 12:30:44 1998
++++ configure.in	Thu Aug 27 12:34:01 1998
+@@ -293,7 +293,14 @@
+ 	next/*) LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';;
+ 	Linux*) LDSHARED="gcc -shared";;
+ 	dgux*) LDSHARED="ld -G";;
+-	FreeBSD*|NetBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
++	FreeBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
++	NetBSD*)
++		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
++		then
++			LDSHARED="cc -shared"
++		else
++			LDSHARED="ld -Bshareable"
++		fi;;
+ 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
+ 	*)	LDSHARED="ld";;
+ 	esac
+@@ -310,7 +317,8 @@
  		 else CCSHARED="+z";
  		 fi;;
  	Linux*) CCSHARED="-fpic";;
 -	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fpic";;
-+	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
++	FreeBSD*|OpenBSD*) CCSHARED="-fpic";;
++	NetBSD*) CCSHARED="-fPIC";;
  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
  	IRIX*/6*)  case $CC in
  		   *gcc*) CCSHARED="-shared";;
---- configure.in.orig	Fri Jul 10 22:58:44 1998
-+++ configure.in	Fri Jul 10 22:59:04 1998
-@@ -310,7 +310,7 @@
+@@ -331,6 +339,11 @@
+ 	Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	next/*) LINKFORSHARED="-u libsys_s";;
+ 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
++	NetBSD*) 
++		if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
++		then
++			LINKFORSHARED="-Wl,--export-dynamic"
++		fi;;
+ 	SunOS/5*) case $CC in
+ 		  *gcc*)
+ 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
+--- configure.orig	Thu Aug 27 12:30:44 1998
++++ configure	Thu Aug 27 12:34:06 1998
+@@ -1843,7 +1843,14 @@
+ 	next/*) LDSHARED='$(CC) $(CFLAGS) -nostdlib -r';;
+ 	Linux*) LDSHARED="gcc -shared";;
+ 	dgux*) LDSHARED="ld -G";;
+-	FreeBSD*|NetBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
++	FreeBSD*|OpenBSD*) LDSHARED="ld -Bshareable";;
++	NetBSD*)
++		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
++		then
++			LDSHARED="cc -shared"
++		else
++			LDSHARED="ld -Bshareable"
++		fi;;
+ 	SCO_SV*) LDSHARED="cc -G -KPIC -Ki486 -belf -Wl,-Bexport";;
+ 	*)	LDSHARED="ld";;
+ 	esac
+@@ -1852,7 +1859,7 @@
+ # CCSHARED are the C *flags* used to create objects to go into a shared
+ # library -- this is only needed for a few systems
+ echo $ac_n "checking CCSHARED""... $ac_c" 1>&6
+-echo "configure:1856: checking CCSHARED" >&5
++echo "configure:1863: checking CCSHARED" >&5
+ if test -z "$CCSHARED"
+ then
+ 	case $ac_sys_system/$ac_sys_release in
+@@ -1861,7 +1868,8 @@
  		 else CCSHARED="+z";
  		 fi;;
  	Linux*) CCSHARED="-fpic";;
 -	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fpic";;
-+	FreeBSD*|NetBSD*|OpenBSD*) CCSHARED="-fPIC";;
++	FreeBSD*|OpenBSD*) CCSHARED="-fpic";;
++	NetBSD*) CCSHARED="-fPIC";;
  	SCO_SV*) CCSHARED="-KPIC -dy -Bdynamic";;
  	IRIX*/6*)  case $CC in
  		   *gcc*) CCSHARED="-shared";;
+@@ -1873,7 +1881,7 @@
+ # 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:1877: checking LINKFORSHARED" >&5
++echo "configure:1885: checking LINKFORSHARED" >&5
+ if test -z "$LINKFORSHARED"
+ then
+ 	case $ac_sys_system/$ac_sys_release in
+@@ -1883,6 +1891,11 @@
+ 	Linux*) LINKFORSHARED="-Xlinker -export-dynamic";;
+ 	next/*) LINKFORSHARED="-u libsys_s";;
+ 	SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;
++	NetBSD*) 
++		if [ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]
++		then
++			LINKFORSHARED="-Wl,--export-dynamic"
++		fi;;
+ 	SunOS/5*) case $CC in
+ 		  *gcc*)
+ 		    if $CC -Xlinker -V 2>/dev/null | grep BFD >/dev/null
+@@ -1896,7 +1909,7 @@
+ 
+ # checks for libraries
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:1900: checking for dlopen in -ldl" >&5
++echo "configure:1913: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1904,7 +1917,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1908 "configure"
++#line 1921 "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
+@@ -1915,7 +1928,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1943,7 +1956,7 @@
+ fi
+ 	# Dynamic linking for SunOS/Solaris and SYSV
+ echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:1947: checking for shl_load in -ldld" >&5
++echo "configure:1960: checking for shl_load in -ldld" >&5
+ ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1951,7 +1964,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldld  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1955 "configure"
++#line 1968 "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
+@@ -1962,7 +1975,7 @@
+ shl_load()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1990,7 +2003,7 @@
+ fi
+ 	# Dynamic linking for HP-UX
+ echo $ac_n "checking for pow in -lm""... $ac_c" 1>&6
+-echo "configure:1994: checking for pow in -lm" >&5
++echo "configure:2007: checking for pow in -lm" >&5
+ ac_lib_var=`echo m'_'pow | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1998,7 +2011,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2002 "configure"
++#line 2015 "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
+@@ -2009,7 +2022,7 @@
+ pow()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2041,7 +2054,7 @@
+ if test "$ac_sys_system" != IRIX
+ then
+ echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
+-echo "configure:2045: checking for t_open in -lnsl" >&5
++echo "configure:2058: checking for t_open in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2049,7 +2062,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2053 "configure"
++#line 2066 "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
+@@ -2060,7 +2073,7 @@
+ t_open()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2081,7 +2094,7 @@
+ fi
+  # SVR4
+ echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+-echo "configure:2085: checking for socket in -lsocket" >&5
++echo "configure:2098: checking for socket in -lsocket" >&5
+ ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2089,7 +2102,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2093 "configure"
++#line 2106 "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
+@@ -2100,7 +2113,7 @@
+ socket()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2123,7 +2136,7 @@
+ fi
+ 
+ echo $ac_n "checking for --with-libs""... $ac_c" 1>&6
+-echo "configure:2127: checking for --with-libs" >&5
++echo "configure:2140: checking for --with-libs" >&5
+ # Check whether --with-libs or --without-libs was given.
+ if test "${with_libs+set}" = set; then
+   withval="$with_libs"
+@@ -2137,7 +2150,7 @@
+ 
+ 
+ echo $ac_n "checking for --with(out)-readline""... $ac_c" 1>&6
+-echo "configure:2141: checking for --with(out)-readline" >&5
++echo "configure:2154: checking for --with(out)-readline" >&5
+ # Check whether --with-readline or --without-readline was given.
+ if test "${with_readline+set}" = set; then
+   withval="$with_readline"
+@@ -2152,7 +2165,7 @@
+ USE_THREAD_MODULE="#"
+ 
+ echo $ac_n "checking for --with-dec-threads""... $ac_c" 1>&6
+-echo "configure:2156: checking for --with-dec-threads" >&5
++echo "configure:2169: 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
+@@ -2168,7 +2181,7 @@
+ 
+ 
+ echo $ac_n "checking for --with-threads""... $ac_c" 1>&6
+-echo "configure:2172: checking for --with-threads" >&5
++echo "configure:2185: checking for --with-threads" >&5
+ # Check whether --with-threads or --without-threads was given.
+ if test "${with_threads+set}" = set; then
+   withval="$with_threads"
+@@ -2182,7 +2195,7 @@
+ 
+ 
+ echo $ac_n "checking for --with-thread""... $ac_c" 1>&6
+-echo "configure:2186: checking for --with-thread" >&5
++echo "configure:2199: checking for --with-thread" >&5
+ # Check whether --with-thread or --without-thread was given.
+ if test "${with_thread+set}" = set; then
+   withval="$with_thread"
+@@ -2198,17 +2211,17 @@
+ 
+ ac_safe=`echo "mach/cthreads.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for mach/cthreads.h""... $ac_c" 1>&6
+-echo "configure:2202: checking for mach/cthreads.h" >&5
++echo "configure:2215: 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 2207 "configure"
++#line 2220 "configure"
+ #include "confdefs.h"
+ #include <mach/cthreads.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2237,7 +2250,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+ echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+-echo "configure:2241: checking for pthread_create in -lpthreads" >&5
++echo "configure:2254: 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
+@@ -2245,7 +2258,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthreads  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2249 "configure"
++#line 2262 "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
+@@ -2256,7 +2269,7 @@
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2285,7 +2298,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+-echo "configure:2289: checking for pthread_create in -lpthread" >&5
++echo "configure:2302: checking for pthread_create in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2293,7 +2306,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2297 "configure"
++#line 2310 "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
+@@ -2304,7 +2317,7 @@
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2333,7 +2346,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+ echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+-echo "configure:2337: checking for pthread_create in -lc_r" >&5
++echo "configure:2350: 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
+@@ -2341,7 +2354,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lc_r  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2345 "configure"
++#line 2358 "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
+@@ -2352,7 +2365,7 @@
+ pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2381,7 +2394,7 @@
+   echo "$ac_t""no" 1>&6
+ 
+ echo $ac_n "checking for __d6_pthread_create in -lthread""... $ac_c" 1>&6
+-echo "configure:2385: checking for __d6_pthread_create in -lthread" >&5
++echo "configure:2398: 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
+@@ -2389,7 +2402,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2393 "configure"
++#line 2406 "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
+@@ -2400,7 +2413,7 @@
+ __d6_pthread_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2440,7 +2453,7 @@
+ 
+ 
+ echo $ac_n "checking for usconfig in -lmpc""... $ac_c" 1>&6
+-echo "configure:2444: checking for usconfig in -lmpc" >&5
++echo "configure:2457: 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
+@@ -2448,7 +2461,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lmpc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2452 "configure"
++#line 2465 "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
+@@ -2459,7 +2472,7 @@
+ usconfig()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2485,7 +2498,7 @@
+ fi
+ 
+ echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6
+-echo "configure:2489: checking for thr_create in -lthread" >&5
++echo "configure:2502: 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
+@@ -2493,7 +2506,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lthread  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2497 "configure"
++#line 2510 "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
+@@ -2504,7 +2517,7 @@
+ thr_create()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2540,7 +2553,7 @@
+ DLINCLDIR=/
+ 
+ echo $ac_n "checking for --with-sgi-dl""... $ac_c" 1>&6
+-echo "configure:2544: checking for --with-sgi-dl" >&5
++echo "configure:2557: 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"
+@@ -2563,7 +2576,7 @@
+ 
+ 
+ echo $ac_n "checking for --with-dl-dld""... $ac_c" 1>&6
+-echo "configure:2567: checking for --with-dl-dld" >&5
++echo "configure:2580: 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"
+@@ -2595,12 +2608,12 @@
+  tcgetpgrp tcsetpgrp times truncate uname waitpid
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2599: checking for $ac_func" >&5
++echo "configure:2612: 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 2604 "configure"
++#line 2617 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2623,7 +2636,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2650,12 +2663,12 @@
+ for ac_func in dup2 getcwd strdup strerror memmove
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2654: checking for $ac_func" >&5
++echo "configure:2667: 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 2659 "configure"
++#line 2672 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -2678,7 +2691,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -2705,12 +2718,12 @@
+ 
+ 
+ echo $ac_n "checking for getpgrp""... $ac_c" 1>&6
+-echo "configure:2709: checking for getpgrp" >&5
++echo "configure:2722: checking for getpgrp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_getpgrp'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2714 "configure"
++#line 2727 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char getpgrp(); below.  */
+@@ -2733,7 +2746,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_getpgrp=yes"
+ else
+@@ -2748,14 +2761,14 @@
+ if eval "test \"`echo '$ac_cv_func_'getpgrp`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat > conftest.$ac_ext <<EOF
+-#line 2752 "configure"
++#line 2765 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int main() {
+ getpgrp(0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define GETPGRP_HAVE_ARG 1
+@@ -2771,12 +2784,12 @@
+ fi
+ 
+ echo $ac_n "checking for setpgrp""... $ac_c" 1>&6
+-echo "configure:2775: checking for setpgrp" >&5
++echo "configure:2788: checking for setpgrp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_setpgrp'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2780 "configure"
++#line 2793 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char setpgrp(); below.  */
+@@ -2799,7 +2812,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_setpgrp=yes"
+ else
+@@ -2814,14 +2827,14 @@
+ if eval "test \"`echo '$ac_cv_func_'setpgrp`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat > conftest.$ac_ext <<EOF
+-#line 2818 "configure"
++#line 2831 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int main() {
+ setpgrp(0,0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define SETPGRP_HAVE_ARG 1
+@@ -2837,12 +2850,12 @@
+ fi
+ 
+ echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6
+-echo "configure:2841: checking for gettimeofday" >&5
++echo "configure:2854: checking for gettimeofday" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2846 "configure"
++#line 2859 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char gettimeofday(); below.  */
+@@ -2865,7 +2878,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_gettimeofday=yes"
+ else
+@@ -2880,14 +2893,14 @@
+ if eval "test \"`echo '$ac_cv_func_'gettimeofday`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   cat > conftest.$ac_ext <<EOF
+-#line 2884 "configure"
++#line 2897 "configure"
+ #include "confdefs.h"
+ #include <sys/time.h>
+ int main() {
+ gettimeofday((struct timeval*)0,(struct timezone*)0);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -2906,12 +2919,12 @@
+ 
+ # checks for structures
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:2910: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:2923: 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 2915 "configure"
++#line 2928 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -2920,7 +2933,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -2941,12 +2954,12 @@
+ fi
+ 
+ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+-echo "configure:2945: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:2958: 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 2950 "configure"
++#line 2963 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <time.h>
+@@ -2954,7 +2967,7 @@
+ struct tm *tp; tp->tm_sec;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm=time.h
+ else
+@@ -2975,12 +2988,12 @@
+ fi
+ 
+ echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+-echo "configure:2979: checking for tm_zone in struct tm" >&5
++echo "configure:2992: 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 2984 "configure"
++#line 2997 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_cv_struct_tm>
+@@ -2988,7 +3001,7 @@
+ struct tm tm; tm.tm_zone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_tm_zone=yes
+ else
+@@ -3008,12 +3021,12 @@
+ 
+ else
+   echo $ac_n "checking for tzname""... $ac_c" 1>&6
+-echo "configure:3012: checking for tzname" >&5
++echo "configure:3025: 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 3017 "configure"
++#line 3030 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ #ifndef tzname /* For SGI.  */
+@@ -3023,7 +3036,7 @@
+ atoi(*tzname);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   ac_cv_var_tzname=yes
+ else
+@@ -3046,19 +3059,19 @@
+ 
+ 
+ echo $ac_n "checking for time.h that defines altzone""... $ac_c" 1>&6
+-echo "configure:3050: checking for time.h that defines altzone" >&5
++echo "configure:3063: 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 3055 "configure"
++#line 3068 "configure"
+ #include "confdefs.h"
+ #include <time.h>
+ int main() {
+ return altzone;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time_altzone=yes
+ else
+@@ -3080,9 +3093,9 @@
+ 
+ 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:3084: checking whether sys/select.h and sys/time.h may both be included" >&5
++echo "configure:3097: checking whether sys/select.h and sys/time.h may both be included" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3086 "configure"
++#line 3099 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3093,7 +3106,7 @@
+ ;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3097: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define SYS_SELECT_WITH_SYS_TIME 1
+@@ -3109,14 +3122,14 @@
+ # checks for compiler characteristics
+ 
+ echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
+-echo "configure:3113: checking whether char is unsigned" >&5
++echo "configure:3126: 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 3120 "configure"
++#line 3133 "configure"
+ #include "confdefs.h"
+ #ifdef __CHAR_UNSIGNED__
+   yes
+@@ -3138,7 +3151,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3142 "configure"
++#line 3155 "configure"
+ #include "confdefs.h"
+ /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
+ #if !defined(__STDC__) || __STDC__ != 1
+@@ -3148,7 +3161,7 @@
+   volatile char c = 255; exit(c < 0);
+ }
+ EOF
+-if { (eval echo configure:3152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_char_unsigned=yes
+ else
+@@ -3173,12 +3186,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:3177: checking for working const" >&5
++echo "configure:3190: 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 3182 "configure"
++#line 3195 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -3227,7 +3240,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -3250,16 +3263,16 @@
+ 
+ works=no
+ echo $ac_n "checking for working volatile""... $ac_c" 1>&6
+-echo "configure:3254: checking for working volatile" >&5
++echo "configure:3267: checking for working volatile" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3256 "configure"
++#line 3269 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ volatile int x; x = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   works=yes
+ else
+@@ -3276,16 +3289,16 @@
+ 
+ works=no
+ echo $ac_n "checking for working signed char""... $ac_c" 1>&6
+-echo "configure:3280: checking for working signed char" >&5
++echo "configure:3293: checking for working signed char" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3282 "configure"
++#line 3295 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ signed char c;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3289: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   works=yes
+ else
+@@ -3302,16 +3315,16 @@
+ 
+ have_prototypes=no
+ echo $ac_n "checking for prototypes""... $ac_c" 1>&6
+-echo "configure:3306: checking for prototypes" >&5
++echo "configure:3319: checking for prototypes" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3308 "configure"
++#line 3321 "configure"
+ #include "confdefs.h"
+ int foo(int x) { return 0; }
+ int main() {
+ return foo(10);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define HAVE_PROTOTYPES 1
+@@ -3326,9 +3339,9 @@
+ 
+ works=no
+ echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
+-echo "configure:3330: checking for variable length prototypes and stdarg.h" >&5
++echo "configure:3343: checking for variable length prototypes and stdarg.h" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3332 "configure"
++#line 3345 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdarg.h>
+@@ -3345,7 +3358,7 @@
+ return foo(10, "", 3.14);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   cat >> confdefs.h <<\EOF
+ #define HAVE_STDARG_PROTOTYPES 1
+@@ -3361,16 +3374,16 @@
+ if test "$have_prototypes" = yes; then
+ bad_prototypes=no
+ echo $ac_n "checking for bad exec* prototypes""... $ac_c" 1>&6
+-echo "configure:3365: checking for bad exec* prototypes" >&5
++echo "configure:3378: checking for bad exec* prototypes" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3367 "configure"
++#line 3380 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int main() {
+ char **t;execve("@",t,t);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3387,12 +3400,12 @@
+ 
+ bad_forward=no
+ echo $ac_n "checking for bad static forward""... $ac_c" 1>&6
+-echo "configure:3391: checking for bad static forward" >&5
++echo "configure:3404: 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 3396 "configure"
++#line 3409 "configure"
+ #include "confdefs.h"
+ 
+ struct s { int a; int b; };
+@@ -3408,7 +3421,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -3427,9 +3440,9 @@
+ 
+ va_list_is_array=no
+ echo $ac_n "checking whether va_list is an array""... $ac_c" 1>&6
+-echo "configure:3431: checking whether va_list is an array" >&5
++echo "configure:3444: checking whether va_list is an array" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3433 "configure"
++#line 3446 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_STDARG_PROTOTYPES
+@@ -3442,7 +3455,7 @@
+ va_list list1, list2; list1 = list2;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   :
+ else
+   echo "configure: failed program was:" >&5
+@@ -3461,7 +3474,7 @@
+ 
+ # Linux requires this for correct f.p. operations
+ echo $ac_n "checking for __fpu_control in -lieee""... $ac_c" 1>&6
+-echo "configure:3465: checking for __fpu_control in -lieee" >&5
++echo "configure:3478: 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
+@@ -3469,7 +3482,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3473 "configure"
++#line 3486 "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
+@@ -3480,7 +3493,7 @@
+ __fpu_control()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3510,7 +3523,7 @@
+ 
+ # Check for --with-fpectl
+ echo $ac_n "checking for --with-fpectl""... $ac_c" 1>&6
+-echo "configure:3514: checking for --with-fpectl" >&5
++echo "configure:3527: checking for --with-fpectl" >&5
+ # Check whether --with-fpectl or --without-fpectl was given.
+ if test "${with_fpectl+set}" = set; then
+   withval="$with_fpectl"
+@@ -3532,7 +3545,7 @@
+ *) LIBM=-lm
+ esac
+ echo $ac_n "checking for --with-libm=STRING""... $ac_c" 1>&6
+-echo "configure:3536: checking for --with-libm=STRING" >&5
++echo "configure:3549: 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"
+@@ -3553,7 +3566,7 @@
+ # check for --with-libc=...
+ 
+ echo $ac_n "checking for --with-libc=STRING""... $ac_c" 1>&6
+-echo "configure:3557: checking for --with-libc=STRING" >&5
++echo "configure:3570: 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"
+@@ -3577,12 +3590,12 @@
+ for ac_func in hypot
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3581: checking for $ac_func" >&5
++echo "configure:3594: 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 3586 "configure"
++#line 3599 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3605,7 +3618,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3632,12 +3645,12 @@
+ for ac_func in hypot
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3636: checking for $ac_func" >&5
++echo "configure:3649: 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 3641 "configure"
++#line 3654 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -3660,7 +3673,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -3690,7 +3703,7 @@
+ 
+ # check for getopt
+ echo $ac_n "checking for genuine getopt""... $ac_c" 1>&6
+-echo "configure:3694: checking for genuine getopt" >&5
++echo "configure:3707: 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
+@@ -3698,7 +3711,7 @@
+   ac_cv_func_getopt=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3702 "configure"
++#line 3715 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ extern int optind, opterr, getopt();
+@@ -3710,7 +3723,7 @@
+ 	exit(0);
+ }
+ EOF
+-if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_getopt=yes
+ else
+@@ -3728,7 +3741,7 @@
+ 
+ # check whether malloc(0) returns NULL or not
+ echo $ac_n "checking what malloc(0) returns""... $ac_c" 1>&6
+-echo "configure:3732: checking what malloc(0) returns" >&5
++echo "configure:3745: 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
+@@ -3736,7 +3749,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3740 "configure"
++#line 3753 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #ifdef HAVE_STDLIB
+@@ -3755,7 +3768,7 @@
+ 	exit(0);
+ }
+ EOF
+-if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_malloc_zero=nonnull
+ else