X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/18ea2752792c81e204ae5b089b8b65544e56fe6e..b0a2e8e64dee1b1bd00055b3c5b69e2c3c888f55:/Configure

diff --git a/Configure b/Configure
index c86961d..b282a16 100755
--- a/Configure
+++ b/Configure
@@ -17,10 +17,16 @@
 # comp.sources.misc and is available on CPAN under authors/id/RAM so
 # you may fetch it yourself from your nearest archive site.)
 #
+#
+# Though this script was generated by metaconfig, it is OK to send
+# patches against it. It's up to the Configure pumpkin to backport
+# the patch to the metaunits if it is accepted.
+# See Porting/pumpkin.pod for more information on metaconfig.
+#
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Feb 11 17:45:48 EET 2002 [metaconfig 3.0 PL70]
+# Generated on Tue Oct 18 16:11:43 CEST 2005 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -47,6 +53,18 @@ true || exec sh $0 $argv:q
 (exit $?0) || exec sh $0 $argv:q
 rm -f c1$$ c2$$
 
+if test -f /dev/cputype -a -f /dev/drivers -a -f /dev/osversion; then
+	cat >&4 <<EOF
+***
+*** I'm sorry but this system looks like Plan 9 and Plan 9 doesn't do
+*** Configure that well.  (Plan 9 is close to UNIX but not close enough.)
+*** Please read the README.plan9 for further instructions.
+*** Cannot continue, aborting.
+***
+EOF
+	exit 1
+fi
+
 : compute my invocation name
 me=$0
 case "$0" in
@@ -59,11 +77,12 @@ esac
 : Proper separator for the PATH environment variable
 p_=:
 : On OS/2 this directory should exist if this is not floppy only system :-]
-if test -d c:/. ; then
+if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' ) 2>&1 >/dev/null ; then
     if test -n "$OS2_SHELL"; then
 		p_=\;
 		PATH=`cmd /c "echo %PATH%" | tr '\\\\' / `
 		OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'`
+		is_os2=yes
 	elif test -n "$DJGPP"; then
 		case "X${MACHTYPE:-nonesuchmach}" in
 		*cygwin) ;;
@@ -78,7 +97,7 @@ paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
 paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
 paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
 paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin"
+paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
 paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
 paths="$paths /sbin /usr/sbin /usr/libexec"
 paths="$paths /system/gnu_library/bin"
@@ -165,7 +184,6 @@ esac
 test -d UU || mkdir UU
 cd UU && rm -f ./*
 
-
 ccname=''
 ccversion=''
 ccsymbols=''
@@ -176,6 +194,7 @@ run=''
 targetarch=''
 to=''
 usecrosscompile=''
+mistrustnm=''
 perllibs=''
 dynamic_ext=''
 extensions=''
@@ -301,8 +320,6 @@ baserev=''
 bin=''
 binexp=''
 installbin=''
-bincompat5005=''
-d_bincompat5005=''
 byteorder=''
 cc=''
 ccflags=''
@@ -324,8 +341,17 @@ cppstdin=''
 d__fwalk=''
 d_access=''
 d_accessx=''
+d_aintl=''
 d_alarm=''
-d_attribut=''
+asctime_r_proto=''
+d_asctime_r=''
+d_attribute_format=''
+d_attribute_malloc=''
+d_attribute_nonnull=''
+d_attribute_noreturn=''
+d_attribute_pure=''
+d_attribute_unused=''
+d_attribute_warn_unused_result=''
 d_bcmp=''
 d_bcopy=''
 d_bzero=''
@@ -336,14 +362,22 @@ d_chown=''
 d_chroot=''
 d_chsize=''
 d_class=''
+d_clearenv=''
 d_closedir=''
 d_void_closedir=''
 d_cmsghdr_s=''
 d_const=''
+d_copysignl=''
 cryptlib=''
 d_crypt=''
+crypt_r_proto=''
+d_crypt_r=''
 d_csh=''
 full_csh=''
+ctermid_r_proto=''
+d_ctermid_r=''
+ctime_r_proto=''
+d_ctime_r=''
 d_cuserid=''
 d_dbl_dig=''
 d_dbminitproto=''
@@ -354,15 +388,30 @@ d_dlopen=''
 d_dlsymun=''
 d_dosuid=''
 d_suidsafe=''
+d_drand48_r=''
+drand48_r_proto=''
 d_drand48proto=''
 d_dup2=''
 d_eaccess=''
 d_endgrent=''
+d_endgrent_r=''
+endgrent_r_proto=''
 d_endhent=''
+d_endhostent_r=''
+endhostent_r_proto=''
 d_endnent=''
+d_endnetent_r=''
+endnetent_r_proto=''
 d_endpent=''
+d_endprotoent_r=''
+endprotoent_r_proto=''
 d_endpwent=''
+d_endpwent_r=''
+endpwent_r_proto=''
 d_endsent=''
+d_endservent_r=''
+endservent_r_proto=''
+d_faststdio=''
 d_fchdir=''
 d_fchmod=''
 d_fchown=''
@@ -397,6 +446,12 @@ d_getcwd=''
 d_getespwnam=''
 d_getfsstat=''
 d_getgrent=''
+d_getgrent_r=''
+getgrent_r_proto=''
+d_getgrgid_r=''
+getgrgid_r_proto=''
+d_getgrnam_r=''
+getgrnam_r_proto=''
 d_getgrps=''
 d_gethbyaddr=''
 d_gethbyname=''
@@ -405,14 +460,28 @@ aphostname=''
 d_gethname=''
 d_phostname=''
 d_uname=''
+d_gethostbyaddr_r=''
+gethostbyaddr_r_proto=''
+d_gethostbyname_r=''
+gethostbyname_r_proto=''
+d_gethostent_r=''
+gethostent_r_proto=''
 d_gethostprotos=''
 d_getitimer=''
 d_getlogin=''
+d_getlogin_r=''
+getlogin_r_proto=''
 d_getmnt=''
 d_getmntent=''
 d_getnbyaddr=''
 d_getnbyname=''
 d_getnent=''
+d_getnetbyaddr_r=''
+getnetbyaddr_r_proto=''
+d_getnetbyname_r=''
+getnetbyname_r_proto=''
+d_getnetent_r=''
+getnetent_r_proto=''
 d_getnetprotos=''
 d_getpagsz=''
 d_getpent=''
@@ -424,17 +493,41 @@ d_getppid=''
 d_getprior=''
 d_getpbyname=''
 d_getpbynumber=''
+d_getprotobyname_r=''
+getprotobyname_r_proto=''
+d_getprotobynumber_r=''
+getprotobynumber_r_proto=''
+d_getprotoent_r=''
+getprotoent_r_proto=''
 d_getprotoprotos=''
 d_getprpwnam=''
 d_getpwent=''
+d_getpwent_r=''
+getpwent_r_proto=''
+d_getpwnam_r=''
+getpwnam_r_proto=''
+d_getpwuid_r=''
+getpwuid_r_proto=''
 d_getsent=''
+d_getservbyname_r=''
+getservbyname_r_proto=''
+d_getservbyport_r=''
+getservbyport_r_proto=''
+d_getservent_r=''
+getservent_r_proto=''
 d_getservprotos=''
 d_getspnam=''
+d_getspnam_r=''
+getspnam_r_proto=''
 d_getsbyname=''
 d_getsbyport=''
+d_gmtime_r=''
+gmtime_r_proto=''
 d_gnulibc=''
+gnulibc_version=''
 d_hasmntopt=''
 d_htonl=''
+d_ilogbl=''
 d_inetaton=''
 d_int64_t=''
 d_isascii=''
@@ -445,7 +538,10 @@ d_isnanl=''
 d_killpg=''
 d_lchown=''
 d_ldbl_dig=''
+d_libm_lib_version=''
 d_link=''
+d_localtime_r=''
+localtime_r_proto=''
 d_locconv=''
 d_lockf=''
 d_longdbl=''
@@ -455,6 +551,8 @@ longlongsize=''
 d_lseekproto=''
 d_lstat=''
 d_madvise=''
+d_malloc_good_size=''
+d_malloc_size=''
 d_mblen=''
 d_mbstowcs=''
 d_mbtowc=''
@@ -473,6 +571,7 @@ d_mmap=''
 mmaptype=''
 d_modfl=''
 d_modfl_pow32_bug=''
+d_modflproto=''
 d_mprotect=''
 d_msg=''
 d_msgctl=''
@@ -497,14 +596,21 @@ procselfexe=''
 d_old_pthread_create_joinable=''
 old_pthread_create_joinable=''
 d_pthread_atfork=''
+d_pthread_attr_setscope=''
 d_pthread_yield=''
 d_sched_yield=''
 sched_yield=''
 d_qgcvt=''
+d_random_r=''
+random_r_proto=''
+d_readdir64_r=''
+readdir64_r_proto=''
 d_readdir=''
 d_rewinddir=''
 d_seekdir=''
 d_telldir=''
+d_readdir_r=''
+readdir_r_proto=''
 d_readlink=''
 d_readv=''
 d_recvmsg=''
@@ -514,6 +620,7 @@ d_safebcpy=''
 d_safemcpy=''
 d_sanemcmp=''
 d_sbrkproto=''
+d_scalbnl=''
 d_select=''
 d_sem=''
 d_semctl=''
@@ -523,12 +630,20 @@ d_sendmsg=''
 d_setegid=''
 d_seteuid=''
 d_setgrent=''
+d_setgrent_r=''
+setgrent_r_proto=''
 d_setgrps=''
 d_sethent=''
+d_sethostent_r=''
+sethostent_r_proto=''
 d_setitimer=''
 d_setlinebuf=''
 d_setlocale=''
+d_setlocale_r=''
+setlocale_r_proto=''
 d_setnent=''
+d_setnetent_r=''
+setnetent_r_proto=''
 d_setpent=''
 d_setpgid=''
 d_setpgrp2=''
@@ -536,7 +651,11 @@ d_bsdsetpgrp=''
 d_setpgrp=''
 d_setprior=''
 d_setproctitle=''
+d_setprotoent_r=''
+setprotoent_r_proto=''
 d_setpwent=''
+d_setpwent_r=''
+setpwent_r_proto=''
 d_setregid=''
 d_setresgid=''
 d_setresuid=''
@@ -544,6 +663,8 @@ d_setreuid=''
 d_setrgid=''
 d_setruid=''
 d_setsent=''
+d_setservent_r=''
+setservent_r_proto=''
 d_setsid=''
 d_setvbuf=''
 d_sfio=''
@@ -558,6 +679,7 @@ d_shmget=''
 d_sigaction=''
 d_sigprocmask=''
 d_sigsetjmp=''
+usesitecustomize=''
 d_sockatmark=''
 d_sockatmarkproto=''
 d_msg_ctrunc=''
@@ -574,6 +696,10 @@ socketlib=''
 d_socklen_t=''
 d_socks5_init=''
 d_sqrtl=''
+d_srand48_r=''
+srand48_r_proto=''
+d_srandom_r=''
+srandom_r_proto=''
 d_sresgproto=''
 d_sresuproto=''
 d_statblks=''
@@ -600,7 +726,11 @@ d_strerrm=''
 d_strerror=''
 d_sysernlst=''
 d_syserrlst=''
+d_strerror_r=''
+strerror_r_proto=''
 d_strftime=''
+d_strlcat=''
+d_strlcpy=''
 d_strtod=''
 d_strtol=''
 d_strtold=''
@@ -622,7 +752,11 @@ d_time=''
 timetype=''
 clocktype=''
 d_times=''
+d_tmpnam_r=''
+tmpnam_r_proto=''
 d_truncate=''
+d_ttyname_r=''
+ttyname_r_proto=''
 d_tzname=''
 d_u32align=''
 d_ualarm=''
@@ -631,6 +765,7 @@ d_semctl_semid_ds=''
 d_semctl_semun=''
 d_union_semun=''
 d_unordered=''
+d_unsetenv=''
 d_usleep=''
 d_usleepproto=''
 d_ustat=''
@@ -659,6 +794,7 @@ fflushNULL=''
 fflushall=''
 fpossize=''
 fpostype=''
+gccansipedantic=''
 gccosandvers=''
 gccversion=''
 gidformat=''
@@ -668,7 +804,14 @@ gidtype=''
 groupstype=''
 h_fcntl=''
 h_sysfile=''
+html1dir=''
+html1direxp=''
+installhtml1dir=''
+html3dir=''
+html3direxp=''
+installhtml3dir=''
 i_arpainet=''
+i_crypt=''
 db_hashtype=''
 db_prefixtype=''
 db_version_major=''
@@ -756,6 +899,8 @@ i_syswait=''
 i_sgtty=''
 i_termio=''
 i_termios=''
+d_tm_tm_gmtoff=''
+d_tm_tm_zone=''
 i_systime=''
 i_systimek=''
 i_time=''
@@ -817,6 +962,7 @@ freetype=''
 mallocobj=''
 mallocsrc=''
 malloctype=''
+usemallocwrap=''
 usemymalloc=''
 installman1dir=''
 man1dir=''
@@ -866,7 +1012,7 @@ perl5=''
 perladmin=''
 perlpath=''
 d_nv_preserves_uv=''
-d_nv_preserves_uv_bits=''
+d_nv_zero_is_allbits_zero=''
 i16size=''
 i16type=''
 i32size=''
@@ -877,6 +1023,7 @@ i8size=''
 i8type=''
 ivsize=''
 ivtype=''
+nv_preserves_uv_bits=''
 nvsize=''
 nvtype=''
 u16size=''
@@ -947,12 +1094,27 @@ sitearchexp=''
 installsitebin=''
 sitebin=''
 sitebinexp=''
+installsitehtml1dir=''
+sitehtml1dir=''
+sitehtml1direxp=''
+installsitehtml3dir=''
+sitehtml3dir=''
+sitehtml3direxp=''
 installsitelib=''
 sitelib=''
 sitelib_stem=''
 sitelibexp=''
+installsiteman1dir=''
+siteman1dir=''
+siteman1direxp=''
+installsiteman3dir=''
+siteman3dir=''
+siteman3direxp=''
 siteprefix=''
 siteprefixexp=''
+installsitescript=''
+sitescript=''
+sitescriptexp=''
 sizesize=''
 sizetype=''
 so=''
@@ -976,6 +1138,7 @@ uidtype=''
 archname64=''
 use64bitall=''
 use64bitint=''
+usefaststdio=''
 ccflags_uselargefiles=''
 ldflags_uselargefiles=''
 libswanted_uselargefiles=''
@@ -988,6 +1151,7 @@ nm_so_opt=''
 runnm=''
 usenm=''
 useperlio=''
+userelocatableinc=''
 usesocks=''
 d_oldpthreads=''
 use5005threads=''
@@ -1005,19 +1169,33 @@ d_vendorbin=''
 installvendorbin=''
 vendorbin=''
 vendorbinexp=''
+installvendorhtml1dir=''
+vendorhtml1dir=''
+vendorhtml1direxp=''
+installvendorhtml3dir=''
+vendorhtml3dir=''
+vendorhtml3direxp=''
 d_vendorlib=''
 installvendorlib=''
 vendorlib=''
 vendorlib_stem=''
 vendorlibexp=''
+installvendorman1dir=''
+vendorman1dir=''
+vendorman1direxp=''
+installvendorman3dir=''
+vendorman3dir=''
+vendorman3direxp=''
 usevendorprefix=''
 vendorprefix=''
 vendorprefixexp=''
+d_vendorscript=''
+installvendorscript=''
+vendorscript=''
+vendorscriptexp=''
 versiononly=''
 defvoidused=''
 voidflags=''
-pm_apiversion=''
-xs_apiversion=''
 yacc=''
 yaccflags=''
 CONFIG=''
@@ -1037,12 +1215,17 @@ if test -f /etc/unixtovms.exe; then
 fi
 
 : Set executable suffix now -- needed before hints available
-: maybe Stratus VOS
-if test -f "/system/gnu_library/bin/ar.pm"; then
+if test -f "/libs/version.library"; then
+: Amiga OS
+    _exe=""
+elif test -f "/system/gnu_library/bin/ar.pm"; then
+: Stratus VOS
     _exe=".pm"
-fi
-: maybe dos djgpp
-if test -n "$DJGPP"; then
+elif test -n "$DJGPP"; then
+: DOS DJGPP
+    _exe=".exe"
+elif test -d c:/. -o -n "$is_os2" ; then
+: OS/2 or cygwin
     _exe=".exe"
 fi
 
@@ -1089,6 +1272,9 @@ plibpth=''
 libswanted=''
 : some systems want to use only the non-versioned libso:s
 ignore_versioned_solibs=''
+siteman1dir=''
+siteman3dir=''
+sitescript=''
 archname64=''
 ccflags_uselargefiles=''
 ldflags_uselargefiles=''
@@ -1101,11 +1287,9 @@ usereentrant='undef'
 defvoidused=15
 
 : List of libraries we want.
-: If anyone needs -lnet, put it in a hint file.
-libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
-libswanted="$libswanted dld ld sun m c cposix posix"
-libswanted="$libswanted ndir dir crypt sec"
-libswanted="$libswanted ucb bsd BSD PW x util"
+: If anyone needs extra -lxxx, put those in a hint file.
+libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun"
+libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
 : We probably want to search /usr/shlib before most other libraries.
 : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
 glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
@@ -1382,23 +1566,23 @@ while test $# -gt 0; do
 	    zzz=''
 	    uuu=undef
 	    case "$yyy" in
-            *=*) zzz=`echo $yyy|sed 's!=.*!!'`
+            *=*) zzz=`echo "$yyy"|sed 's!=.*!!'`
                  case "$zzz" in
                  *:*) zzz='' ;;
                  *)   xxx=append
-                      zzz=" "`echo $yyy|sed 's!^[^=]*=!!'` 
-                      yyy=`echo $yyy|sed 's!=.*!!'` ;;
+                      zzz=" "`echo "$yyy"|sed 's!^[^=]*=!!'` 
+                      yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
                  esac
                  ;;
             esac
             case "$xxx" in
             '')  case "$yyy" in
-                 *:*) xxx=`echo $yyy|sed 's!:.*!!'`
-                      yyy=`echo $yyy|sed 's!^[^:]*:!!'`
-                      zzz=`echo $yyy|sed 's!^[^=]*=!!'`
-                      yyy=`echo $yyy|sed 's!=.*!!'` ;;
-                 *)   xxx=`echo $yyy|sed 's!:.*!!'`
-                      yyy=`echo $yyy|sed 's!^[^:]*:!!'` ;;
+                 *:*) xxx=`echo "$yyy"|sed 's!:.*!!'`
+                      yyy=`echo "$yyy"|sed 's!^[^:]*:!!'`
+                      zzz=`echo "$yyy"|sed 's!^[^=]*=!!'`
+                      yyy=`echo "$yyy"|sed 's!=.*!!'` ;;
+                 *)   xxx=`echo "$yyy"|sed 's!:.*!!'`
+                      yyy=`echo "$yyy"|sed 's!^[^:]*:!!'` ;;
                  esac
                  ;;       
             esac
@@ -1702,7 +1886,7 @@ rm -f .echotmp
 echo " "
 if test -f "$rsrc/MANIFEST"; then
 	echo "First let's make sure your kit is complete.  Checking..." >&4
-	awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | split -50
+	awk '$1 !~ /PACK[A-Z]+/ {print $1}' "$rsrc/MANIFEST" | (split -l 50 2>/dev/null || split -50)
 	rm -f missing
 	tmppwd=`pwd`
 	for filelist in x??; do
@@ -1756,6 +1940,11 @@ if test X"$trnl" = X; then
 	esac
 fi
 if test X"$trnl" = X; then
+       case "`echo foo|tr '\r\n' xy 2>/dev/null`" in
+       fooxy) trnl='\n\r' ;;
+       esac
+fi
+if test X"$trnl" = X; then
 	cat <<EOM >&2
 
 $me: Fatal Error: cannot figure out how to translate newlines with 'tr'.
@@ -2044,9 +2233,10 @@ for dir in \$*; do
 	elif test -f \$dir/\$thing.exe; then
 		if test -n "$DJGPP"; then
 			echo \$dir/\$thing.exe
-		else
+		elif test "$eunicefix" != ":"; then
 			: on Eunice apparently
 			echo \$dir/\$thing
+			exit 0
 		fi
 		exit 0
 	fi
@@ -2242,10 +2432,10 @@ FOO
 	;;
 esac
 
-cat <<EOS >checkcc
+cat <<EOS >trygcc
 $startsh
 EOS
-cat <<'EOSC' >>checkcc
+cat <<'EOSC' >>trygcc
 case "$cc" in
 '') ;;
 *)  $rm -f try try.*
@@ -2283,19 +2473,50 @@ EOM
                     fi
                 fi  
                 case "$ans" in
-                [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no ;;
+                [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no;
+                       if $test -f usethreads.cbu; then
+                           $cat >&4 <<EOM 
+
+*** However, any setting of the C compiler flags (e.g. for thread support)
+*** has been lost.  It may be necessary to pass -Dcc=gcc to Configure
+*** (together with e.g. -Dusethreads).
+
+EOM
+                       fi;;
                 esac
             fi
         fi
+    fi
+    $rm -f try try.*
+    ;;
+esac
+EOSC
+
+cat <<EOS >checkcc
+$startsh
+EOS
+cat <<'EOSC' >>checkcc
+case "$cc" in        
+'') ;;
+*)  $rm -f try try.*              
+    $cat >try.c <<EOM
+int main(int argc, char *argv[]) {
+  return 0;
+}
+EOM
+    if $cc -o try $ccflags $ldflags try.c; then
+       :
+    else
         if $test X"$despair" = Xyes; then
-	    $cat >&4 <<EOM
+           echo "Uh-oh, the C compiler '$cc' doesn't seem to be working." >&4
+        fi
+        $cat >&4 <<EOM         
 You need to find a working C compiler.
 Either (purchase and) install the C compiler supplied by your OS vendor,
 or for a free C compiler try http://gcc.gnu.org/
 I cannot continue any further, aborting.
 EOM
-            exit 1
-        fi
+        exit 1
     fi
     $rm -f try try.*
     ;;
@@ -2307,7 +2528,7 @@ echo " "
 $touch blurfl
 if $ln -s blurfl sym > /dev/null 2>&1 ; then
 	echo "Symbolic links are supported." >&4
-	lns="$ln$_exe -s"
+	lns="$ln -s"
 else
 	echo "Symbolic links are NOT supported." >&4
 	lns="$ln"
@@ -2380,7 +2601,7 @@ $define|true|[yY]*)
 		exit 1
 		;;
 	*)	case "$lns:$issymlink" in
-		*"ln -s:"*"test -"?)
+		*"ln"*" -s:"*"test -"?)
 			echo "Creating the symbolic links..." >&4
 			echo "(First creating the subdirectories...)" >&4
 			cd ..
@@ -2676,37 +2897,37 @@ ABYZ)
 	up='[:upper:]'
 	low='[:lower:]'
 	;;
-*)	# There is a discontinuity in EBCDIC between 'I' and 'J'
-        # (0xc9 and 0xd1), therefore that is a nice testing point.
-        if test "X$up" = X -o "X$low" = X; then
-	    case "`echo IJ | $tr '[I-J]' '[i-j]' 2>/dev/null`" in
-	    ij) up='[A-Z]'
-	        low='[a-z]'
+*)	# There is a discontinuity in EBCDIC between 'R' and 'S'
+	# (0xd9 and 0xe2), therefore that is a nice testing point.
+	if test "X$up" = X -o "X$low" = X; then
+	    case "`echo RS | $tr '[R-S]' '[r-s]' 2>/dev/null`" in
+	    rs) up='[A-Z]'
+		low='[a-z]'
 		;;
 	    esac
-        fi
+	fi
 	if test "X$up" = X -o "X$low" = X; then
-	    case "`echo IJ | $tr I-J i-j 2>/dev/null`" in
-	    ij) up='A-Z'
+	    case "`echo RS | $tr R-S r-s 2>/dev/null`" in
+	    rs) up='A-Z'
 		low='a-z'
 		;;
 	    esac
-        fi
+	fi
 	if test "X$up" = X -o "X$low" = X; then
-	    case "`echo IJ | od -x 2>/dev/null`" in
-	    *C9D1*|*c9d1*)
+	    case "`echo RS | od -x 2>/dev/null`" in
+	    *D9E2*|*d9e2*)
 		echo "Hey, this might be EBCDIC." >&4
 		if test "X$up" = X -o "X$low" = X; then
-		    case "`echo IJ | $tr '[A-IJ-RS-Z]' '[a-ij-rs-z]' 2>/dev/null`" in
-		    ij) up='[A-IJ-RS-Z]'
-		        low='[a-ij-rs-z]'
+		    case "`echo RS | $tr '[A-IJ-RS-Z]' '[a-ij-rs-z]' 2>/dev/null`" in
+		    rs) up='[A-IJ-RS-Z]'
+			low='[a-ij-rs-z]'
 			;;
 		    esac
 		fi
 		if test "X$up" = X -o "X$low" = X; then
-		    case "`echo IJ | $tr A-IJ-RS-Z a-ij-rs-z 2>/dev/null`" in
-		    ij) up='A-IJ-RS-Z'
-		        low='a-ij-rs-z'
+		    case "`echo RS | $tr A-IJ-RS-Z a-ij-rs-z 2>/dev/null`" in
+		    rs) up='A-IJ-RS-Z'
+			low='a-ij-rs-z'
 			;;
 		    esac
 		fi
@@ -2714,8 +2935,8 @@ ABYZ)
 	    esac
 	fi
 esac
-case "`echo IJ | $tr \"$up\" \"$low\" 2>/dev/null`" in
-ij)
+case "`echo RS | $tr \"$up\" \"$low\" 2>/dev/null`" in
+rs)
     echo "Using $up and $low to convert case." >&4
     ;;
 *)
@@ -2881,7 +3102,9 @@ EOM
 		aix) osname=aix
 			tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1`
 			case "$tmp" in
-			'not found') osvers="$4"."$3" ;;
+			# oslevel can fail with:
+			# oslevel: Unable to acquire lock.
+			*not\ found) osvers="$4"."$3" ;;
 			'<3240'|'<>3240') osvers=3.2.0 ;;
 			'=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;;
 			'=3250'|'>3250') osvers=3.2.5 ;;
@@ -2903,7 +3126,7 @@ EOM
 		domainos) osname=apollo
 			osvers="$3"
 			;;
-		dgux) osname=dgux 
+		dgux)	osname=dgux 
 			osvers="$3"
 			;;
 		dynixptx*) osname=dynixptx
@@ -2911,23 +3134,25 @@ EOM
 			;;
 		freebsd) osname=freebsd 
 			osvers="$3" ;;
-		genix) osname=genix ;;
-		hp*) osname=hpux 
+		genix)	osname=genix ;;
+		gnu)	osname=gnu
+			osvers="$3" ;;
+		hp*)	osname=hpux 
 			osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'`
 			;;
-		irix*) osname=irix
+		irix*)	osname=irix
 			case "$3" in
 			4*) osvers=4 ;;
 			5*) osvers=5 ;;
 			*)	osvers="$3" ;;
 			esac
 			;;
-		linux) osname=linux
+		linux)	osname=linux
 			case "$3" in
 			*)	osvers="$3" ;;
 			esac
 			;;
-		MiNT) osname=mint
+		MiNT)	osname=mint
 			;;
 		netbsd*) osname=netbsd
 			osvers="$3"
@@ -2940,6 +3165,12 @@ EOM
 			;;
 		next*) osname=next ;;
 		nonstop-ux) osname=nonstopux ;;
+		openbsd) osname=openbsd
+                	osvers="$3"
+                	;;
+		os2)	osname=os2
+			osvers="$4"
+			;;
 		POSIX-BC | posix-bc ) osname=posix-bc
 			osvers="$3"
 			;;
@@ -2978,7 +3209,7 @@ EOM
 		osf1|mls+)	case "$5" in
 				alpha)
 					osname=dec_osf
-					osvers=`sizer -v | awk '{print $3}' |  tr '[A-Z]' '[a-z]' | sed 's/^[xvt]//'`
+					osvers=`sizer -v | awk -FUNIX '{print $2}' | awk '{print $1}' |  tr '[A-Z]' '[a-z]' | sed 's/^[xvt]//'`
 					case "$osvers" in
 					[1-9].[0-9]*) ;;
 					*) osvers=`echo "$3" | sed 's/^[xvt]//'` ;;
@@ -2988,7 +3219,8 @@ EOM
 			mips)	osname=mips_osf1 ;;
 			esac
 			;;
-		unixware) osname=svr5
+		# UnixWare 7.1.2 is known as Open UNIX 8
+		openunix|unixware) osname=svr5
 			osvers="$4"
 			;;
 		uts)	osname=uts
@@ -3058,7 +3290,7 @@ EOM
 				osname=news_os
 			fi
 			$rm -f UU/kernel.what
-		elif test -d c:/.; then
+		elif test -d c:/. -o -n "$is_os2" ; then
 			set X $myuname
 			osname=os2
 			osvers="$5"
@@ -3251,12 +3483,15 @@ esac
 
 : who configured the system
 cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1`
-cf_by=`(logname) 2>/dev/null`
 case "$cf_by" in
 "")
-	cf_by=`(whoami) 2>/dev/null`
+	cf_by=`(logname) 2>/dev/null`
 	case "$cf_by" in
-	"") cf_by=unknown ;;
+	"")
+		cf_by=`(whoami) 2>/dev/null`
+		case "$cf_by" in
+		"") cf_by=unknown ;;
+		esac ;;
 	esac ;;
 esac
 
@@ -3284,20 +3519,100 @@ $undef$define) . ./whoa; eval "$var=\$tu";;
 *) eval "$var=$val";;
 esac'
 
+case "$usesocks" in
+$define|true|[yY]*)	dflt='y';;
+*) dflt='n';;
+esac
+cat <<EOM
+
+Perl can be built to use the SOCKS proxy protocol library.  To do so,
+Configure must be run with -Dusesocks.  If you use SOCKS you also need
+to use the PerlIO abstraction layer, this will be implicitly selected.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
+rp='Build Perl for SOCKS?'
+. ./myread
+case "$ans" in
+y|Y)	val="$define" ;;     
+*)      val="$undef" ;;
+esac
+set usesocks
+eval $setvar
+
+case "$usesocks" in
+$define|true|[yY]*) useperlio="$define";;
+esac
+
+case "$useperlio" in
+$define|true|[yY]*|'')	dflt='y';;
+*) dflt='n';;
+esac
+cat <<EOM
+
+Previous version of $package used the standard IO mechanisms as
+defined in <stdio.h>.  Versions 5.003_02 and later of $package allow
+alternate IO mechanisms via the PerlIO abstraction layer, but the
+stdio mechanism is still available if needed.  The abstraction layer
+can use AT&T's sfio (if you already have sfio installed) or regular stdio.
+Using PerlIO with sfio may cause problems with some extension modules.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
+rp='Use the PerlIO abstraction layer?'
+. ./myread
+case "$ans" in
+y|Y) 
+	val="$define"
+	;;
+*)      
+	echo "Ok, doing things the stdio way."
+	val="$undef"
+	;;
+esac
+set useperlio
+eval $setvar 
+
+case "$usesocks" in
+$define|true|[yY]*)
+	case "$useperlio" in
+	$define|true|[yY]*) ;;
+	*)	cat >&4 <<EOM
+
+You are using the SOCKS proxy protocol library which means that you
+should also use the PerlIO layer.  You may be headed for trouble.
+
+EOM
+		;;
+	esac
+	;;
+esac
+
+	
 case "$usethreads" in
 $define|true|[yY]*)     dflt='y';;
-*) dflt='n';;
+*)     # Catch case where user specified ithreads or 5005threads but
+       # forgot -Dusethreads (A.D. 4/2002)
+       case "$useithreads$use5005threads" in
+       *$define*)      
+		case "$useperlio" in
+		"$define")	dflt='y' ;;
+		*)		dflt='n' ;;
+		esac
+		;;
+       *)	dflt='n';;
+       esac
+       ;;
 esac
 cat <<EOM
 
 Perl can be built to take advantage of threads on some systems.
 To do so, Configure can be run with -Dusethreads.
 
-Note that threading is a highly experimental feature, and
-some known race conditions still remain.  If you choose to try
-it, be very sure to not actually deploy it for production
-purposes.  README.threads has more details, and is required
-reading if you enable threads.
+Note that Perl built with threading support runs slightly slower
+and uses more memory than plain Perl. The current implementation
+is believed to be stable, but it is fairly new, and so should be
+treated with caution.
 
 If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
@@ -3314,16 +3629,14 @@ case "$usethreads" in
 $define)
 	$cat <<EOM
 
-As of 5.5.640, Perl has two different internal threading implementations,
-the 5.005 version (5005threads) and an interpreter-based version
-(ithreads) that has one interpreter per thread.  Both are very 
-experimental.  This arrangement exists to help developers work out
-which one is better.
+Since release 5.6, Perl has had two different threading implementations,
+the newer interpreter-based version (ithreads) with one interpreter per
+thread, and the older 5.005 version (5005threads).
+The 5005threads version is effectively unmaintained and will probably be
+removed in Perl 5.10, so there should be no need to build a Perl using it
+unless needed for backwards compatibility with some existing 5.005threads
+code.
 
-If you're a casual user, you probably don't want interpreter-threads
-at this time.  But if you do, the 'threads' module allows their use,
-and the 'Thread' module offers an interface to both 5005threads and
-ithreads (whichever has been configured).
 EOM
 	: Default to ithreads unless overridden on command line or with
 	: old config.sh
@@ -3334,7 +3647,7 @@ EOM
 	case "$useithreads" in
 		$undef|false|[nN]*) dflt='n';;
 	esac
-	rp='Use interpreter-based ithreads?'
+	rp='Use the newer interpreter-based ithreads?'
 	. ./myread
 	case "$ans" in
 	y|Y)    val="$define" ;;
@@ -3369,6 +3682,16 @@ EOM
 	;;
 esac
 
+if test X"$usethreads" = "X$define" -a "X$useperlio" = "Xundef"; then
+	cat >&4 <<EOF
+***
+*** To build with ithreads you must also use the PerlIO layer.
+*** Cannot continue, aborting.
+***
+EOF
+	exit 1
+fi
+
 case "$d_oldpthreads" in
 '')	: Configure tests would be welcome here.  For now, assume undef.
 	val="$undef" ;;
@@ -3378,22 +3701,22 @@ set d_oldpthreads
 eval $setvar
 
 
-case "$usethreads" in
-"$define"|true|[yY]*)
 : Look for a hint-file generated 'call-back-unit'.  If the
 : user has specified that a threading perl is to be built,
 : we may need to set or change some other defaults.
-	if $test -f usethreads.cbu; then
-		echo "Your platform has some specific hints for threaded builds, using them..."
-		. ./usethreads.cbu
-	else
+if $test -f usethreads.cbu; then
+    echo "Your platform has some specific hints regarding threaded builds, using them..."
+    . ./usethreads.cbu
+else
+    case "$usethreads" in
+	"$define"|true|[yY]*)
 		$cat <<EOM
-(Your platform doesn't have any specific hints for threaded builds.
+(Your platform does not have any specific hints for threaded builds.
  Assuming POSIX threads, then.)
 EOM
-	fi
 	;;
-esac
+    esac
+fi
 
 cat <<EOM
 
@@ -3538,6 +3861,9 @@ esac
 rp="Use which C compiler?"
 . ./myread
 cc="$ans"
+
+: See if they have not cc but they do have gcc
+. ./trygcc
 : Look for a hint-file generated 'call-back-unit'.  Now that the
 : user has specified the compiler, we may need to set or change some
 : other defaults.
@@ -3558,7 +3884,7 @@ int main() {
 	printf("%s\n", "1");
 #endif
 #endif
-	exit(0);
+	return(0);
 }
 EOM
 if $cc -o try $ccflags $ldflags try.c; then
@@ -3566,7 +3892,7 @@ if $cc -o try $ccflags $ldflags try.c; then
 	case "$gccversion" in
 	'') echo "You are not using GNU cc." ;;
 	*)  echo "You are using GNU cc $gccversion."
-	    ccname=gcc	
+	    ccname=gcc
 	    ;;
 	esac
 else
@@ -3619,6 +3945,20 @@ case "$ccname" in
 '') ccname="$cc" ;;
 esac
 
+# gcc 3.* complain about adding -Idirectories that they already know about,
+# so we will take those off from locincpth.
+case "$gccversion" in
+3*)
+    echo "main(){}">try.c
+    for incdir in $locincpth; do
+       warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \
+	     grep '^c[cp]p*[01]: warning: changing search order '`
+       if test "X$warn" != X; then
+	   locincpth=`echo " $locincpth " | sed "s! $incdir ! !"`
+       fi
+    done
+    $rm -f try try.*
+esac
 
 : decide how portable to be.  Allow command line overrides.
 case "$d_portable" in
@@ -3686,7 +4026,9 @@ esac
 
 case "$fn" in
 *\(*)
-	expr $fn : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
+	: getfile will accept an answer from the comma-separated list
+	: enclosed in parentheses even if it does not meet other criteria.
+	expr "$fn" : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
 	fn=`echo $fn | sed 's/(.*)//'`
 	;;
 esac
@@ -4204,31 +4546,50 @@ case "$firstmakefile" in
 '') firstmakefile='makefile';;
 esac
 
-case "$usesocks" in
+case "$ccflags" in
+*-DUSE_LONG_DOUBLE*|*-DUSE_MORE_BITS*) uselongdouble="$define" ;;
+esac
+
+case "$uselongdouble" in
 $define|true|[yY]*)	dflt='y';;
 *) dflt='n';;
 esac
 cat <<EOM
 
-Perl can be built to use the SOCKS proxy protocol library.  To do so,
-Configure must be run with -Dusesocks.  If you use SOCKS you also need
-to use the PerlIO abstraction layer, this will be implicitly selected.
+Perl can be built to take advantage of long doubles which
+(if available) may give more accuracy and range for floating point numbers.
 
 If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-rp='Build Perl for SOCKS?'
+rp='Try to use long doubles if available?'
 . ./myread
 case "$ans" in
-y|Y)	val="$define" ;;     
-*)      val="$undef" ;;
+y|Y) 	val="$define"	;;
+*)      val="$undef"	;;
 esac
-set usesocks
+set uselongdouble
 eval $setvar
 
-case "$usesocks" in
-$define|true|[yY]*) useperlio="$define";;
+case "$uselongdouble" in
+true|[yY]*) uselongdouble="$define" ;;
 esac
 
+: Look for a hint-file generated 'call-back-unit'.  If the
+: user has specified that long doubles should be used,
+: we may need to set or change some other defaults.
+if $test -f uselongdouble.cbu; then
+    echo "Your platform has some specific hints regarding long doubles, using them..."
+    . ./uselongdouble.cbu
+else
+    case "$uselongdouble" in
+	$define)
+		$cat <<EOM
+(Your platform does not have any specific hints for long doubles.)
+EOM
+	;;
+    esac
+fi
+
 : Looking for optional libraries
 echo " "
 echo "Checking for optional libraries..." >&4
@@ -4253,7 +4614,7 @@ for thislib in $libswanted; do
 	for thisdir in $libspath; do
 	    xxx=''
 	    if $test ! -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then
-		xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|tail -1`
+		xxx=`ls $thisdir/lib$thislib.$so.[0-9] 2>/dev/null|sed -n '$p'`
 	        $test -f "$xxx" && eval $libscheck
 		$test -f "$xxx" && libstyle=shared
 	    fi
@@ -4371,6 +4732,7 @@ default|recommended)
 	2*) if test -d /etc/conf/kconfig.d &&
 			$contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1
 		then
+			# Interactive Systems (ISC) POSIX mode.
 			dflt="$dflt -posix"
 		fi
 		;;
@@ -4384,7 +4746,7 @@ default|recommended)
 		if $cc -O2 -fno-strict-aliasing -o gcctest gcctest.c; then
 			echo "Yes, it does." 2>&1
 			case "$ccflags" in
-			*strict-aliasing*) 
+			*strict-aliasing*)
 				echo "Leaving current flags $ccflags alone." 2>&1
 				;;
 			*) dflt="$dflt -fno-strict-aliasing" ;;
@@ -4394,6 +4756,40 @@ default|recommended)
 		fi
 		;;
 	esac
+	# For gcc, adding -pipe speeds up compilations for some, but apparently
+	# some assemblers can't read from stdin.  (It also slows down compilations
+	# in other cases, but those are apparently rarer these days.)  AD 5/2004.
+	case "$gccversion" in
+	?*)	echo " "
+		echo "Checking if your compiler accepts -pipe" 2>&1
+		echo 'int main(void) { return 0; }' > gcctest.c
+		if $cc -pipe -o gcctest gcctest.c; then
+			echo "Yes, it does." 2>&1
+			case "$ccflags" in
+			*-pipe*)
+				echo "Leaving current flags $ccflags alone." 2>&1
+				;;
+			*) dflt="$dflt -pipe" ;;
+			esac
+		else
+			echo "Nope, it doesn't, but that's ok." 2>&1
+		fi
+
+		echo "Checking if your compiler accepts -Wdeclaration-after-statement" 2>&1
+		echo 'int main(void) { return 0; }' > gcctest.c
+		if $cc -Wdeclaration-after-statement -o gcctest gcctest.c; then
+			echo "Yes, it does." 2>&1
+			case "$ccflags" in
+			*-Wdeclaration-after-statement*)
+				echo "Leaving current flags $ccflags alone." 2>&1
+				;;
+			*) dflt="$dflt -Wdeclaration-after-statement" ;;
+			esac
+		else
+			echo "Nope, it doesn't, but that's ok." 2>&1
+		fi
+		;;
+	esac
 	;;
 esac
 
@@ -4405,8 +4801,8 @@ for thisincl in $inclwanted; do
 	if $test -d $thisincl; then
 		if $test x$thisincl != x$usrinc; then
 			case "$dflt" in
-                        *" -I$thisincl "*);;
-                        *) dflt="$dflt -I$thisincl ";;
+			*" -I$thisincl "*);;
+			*) dflt="$dflt -I$thisincl ";;
 			esac
 		fi
 	fi
@@ -4537,7 +4933,7 @@ esac
 for thislibdir in $libpth; do
 	case " $loclibpth " in
 	*" $thislibdir "*)
-		case "$dflt " in 
+		case "$dflt " in
 		*"-L$thislibdir "*) ;;
 		*)  dflt="$dflt -L$thislibdir" ;;
 		esac
@@ -4576,7 +4972,7 @@ echo " "
 echo "Checking your choice of C compiler and flags for coherency..." >&4
 $cat > try.c <<'EOF'
 #include <stdio.h>
-int main() { printf("Ok\n"); exit(0); }
+int main() { printf("Ok\n"); return(0); }
 EOF
 set X $cc -o try $optimize $ccflags $ldflags try.c $libs
 shift
@@ -4660,231 +5056,12 @@ mc_file=$1;
 shift;
 $cc -o ${mc_file} $optimize $ccflags $ldflags $* ${mc_file}.c $libs;'
 
-: check for lengths of integral types
+: determine filename position in cpp output
 echo " "
-case "$intsize" in
-'')
-	echo "Checking to see how big your integers are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-	printf("intsize=%d;\n", (int)sizeof(int));
-	printf("longsize=%d;\n", (int)sizeof(long));
-	printf("shortsize=%d;\n", (int)sizeof(short));
-	exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok && $run ./try > /dev/null; then
-		eval `$run ./try`
-		echo "Your integers are $intsize bytes long."
-		echo "Your long integers are $longsize bytes long."
-		echo "Your short integers are $shortsize bytes long."
-	else
-		$cat >&4 <<EOM
-!
-Help! I can't compile and run the intsize test program: please enlighten me!
-(This is probably a misconfiguration in your system or libraries, and
-you really ought to fix it.  Still, I'll try anyway.)
-!
-EOM
-		dflt=4
-		rp="What is the size of an integer (in bytes)?"
-		. ./myread
-		intsize="$ans"
-		dflt=$intsize
-		rp="What is the size of a long integer (in bytes)?"
-		. ./myread
-		longsize="$ans"
-		dflt=2
-		rp="What is the size of a short integer (in bytes)?"
-		. ./myread
-		shortsize="$ans"
-	fi
-	;;
-esac
-$rm -f try try.*
-
-: check for void type
-echo " "
-echo "Checking to see how well your C compiler groks the void type..." >&4
-case "$voidflags" in
-'')
-	$cat >try.c <<'EOCP'
-#if TRY & 1
-void sub() {
-#else
-sub() {
-#endif
-	extern void moo();	/* function returning void */
-	void (*goo)();		/* ptr to func returning void */
-#if TRY & 8
-	void *hue;		/* generic ptr */
-#endif
-#if TRY & 2
-	void (*foo[10])();
-#endif
-
-#if TRY & 4
-	if(goo == moo) {
-		exit(0);
-	}
-#endif
-	exit(0);
-}
-int main() { sub(); }
-EOCP
-	if $cc $ccflags -c -DTRY=$defvoidused try.c >.out 2>&1 ; then
-		voidflags=$defvoidused
-	echo "Good.  It appears to support void to the level $package wants.">&4
-		if $contains warning .out >/dev/null 2>&1; then
-			echo "However, you might get some warnings that look like this:"
-			$cat .out
-		fi
-	else
-echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4
-		if $cc $ccflags -c -DTRY=1 try.c >/dev/null 2>&1; then
-			echo "It supports 1..."
-			if $cc $ccflags -c -DTRY=3 try.c >/dev/null 2>&1; then
-				echo "It also supports 2..."
-				if $cc $ccflags -c -DTRY=7 try.c >/dev/null 2>&1; then
-					voidflags=7
-					echo "And it supports 4 but not 8 definitely."
-				else
-					echo "It doesn't support 4..."
-					if $cc $ccflags -c -DTRY=11 try.c >/dev/null 2>&1; then
-						voidflags=11
-						echo "But it supports 8."
-					else
-						voidflags=3
-						echo "Neither does it support 8."
-					fi
-				fi
-			else
-				echo "It does not support 2..."
-				if $cc $ccflags -c -DTRY=13 try.c >/dev/null 2>&1; then
-					voidflags=13
-					echo "But it supports 4 and 8."
-				else
-					if $cc $ccflags -c -DTRY=5 try.c >/dev/null 2>&1; then
-						voidflags=5
-						echo "And it supports 4 but has not heard about 8."
-					else
-						echo "However it supports 8 but not 4."
-					fi
-				fi
-			fi
-		else
-			echo "There is no support at all for void."
-			voidflags=0
-		fi
-	fi
-esac
-case "$voidflags" in
-"$defvoidused") ;;
-*)	$cat >&4 <<'EOM'
-  Support flag bits are:
-    1: basic void declarations.
-    2: arrays of pointers to functions returning void.
-    4: operations between pointers to and addresses of void functions.
-    8: generic void pointers.
-EOM
-	dflt="$voidflags";
-	rp="Your void support flags add up to what?"
-	. ./myread
-	voidflags="$ans"
-	;;
-esac
-$rm -f try.* .out
-
-: check for length of pointer
-echo " "
-case "$ptrsize" in
-'')
-	echo "Checking to see how big your pointers are..." >&4
-	if test "$voidflags" -gt 7; then
-		echo '#define VOID_PTR char *' > try.c
-	else
-		echo '#define VOID_PTR void *' > try.c
-	fi
-	$cat >>try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof(VOID_PTR));
-    exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		ptrsize=`$run ./try`
-		echo "Your pointers are $ptrsize bytes long."
-	else
-		dflt='4'
-		echo "(I can't seem to compile the test program.  Guessing...)" >&4
-		rp="What is the size of a pointer (in bytes)?"
-		. ./myread
-		ptrsize="$ans"
-	fi
-	;;
-esac
-$rm -f try.c try
-
-: check for long long
-echo " "
-echo "Checking to see if you have long long..." >&4
-echo 'int main() { long long x = 7; return 0; }' > try.c
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have long long."
-else
-	val="$undef"
-	echo "You do not have long long."
-fi
-$rm try.*
-set d_longlong
-eval $setvar
-
-: check for length of long long
-case "${d_longlong}${longlongsize}" in
-$define)
-	echo " "
-	echo "Checking to see how big your long longs are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof(long long));
-    return(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		longlongsize=`$run ./try`
-		echo "Your long longs are $longlongsize bytes long."
-	else
-		dflt='8'
-		echo " "
-		echo "(I can't seem to compile the test program.  Guessing...)"
-		rp="What is the size of a long long (in bytes)?"
-		. ./myread
-		longlongsize="$ans"
-	fi
-	if $test "X$longsize" = "X$longlongsize"; then
-		echo "(That isn't any different from an ordinary long.)"
-	fi	
-	;;
-esac
-$rm -f try.* try
-
-: determine filename position in cpp output
-echo " "
-echo "Computing filename position in cpp output for #include directives..." >&4
-case "$osname" in
-vos) testaccess=-e ;;
-*)   testaccess=-r ;;
+echo "Computing filename position in cpp output for #include directives..." >&4
+case "$osname" in
+vos) testaccess=-e ;;
+*)   testaccess=-r ;;
 esac
 echo '#include <stdio.h>' > foo.c
 $cat >fieldn <<EOF
@@ -4918,6 +5095,7 @@ echo "Your cpp writes the filename in the $pos field of the line."
 
 case "$osname" in
 vos) cppfilter="tr '\\\\>' '/' |" ;; # path component separator is >
+os2) cppfilter="sed -e 's|\\\\\\\\|/|g' |" ;; # path component separator is \
 *)   cppfilter='' ;;
 esac
 : locate header file
@@ -4988,38 +5166,140 @@ do set $yyy; var=$2; eval "was=\$$2";
 	set $yyy; shift; shift; yyy=$@;
 done'
 
-: see if inttypes.h is available
-: we want a real compile instead of Inhdr because some systems
-: have an inttypes.h which includes non-existent headers
+: see if stdlib is available
+set stdlib.h i_stdlib
+eval $inhdr
+
+: check for lengths of integral types
 echo " "
-$cat >try.c <<EOCP
-#include <inttypes.h>
-int main() {
-	static int32_t foo32 = 0x12345678;
+case "$intsize" in
+'')
+	echo "Checking to see how big your integers are..." >&4
+	$cat >try.c <<EOCP
+#include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+int main()
+{
+	printf("intsize=%d;\n", (int)sizeof(int));
+	printf("longsize=%d;\n", (int)sizeof(long));
+	printf("shortsize=%d;\n", (int)sizeof(short));
+	exit(0);
 }
 EOCP
+	set try
+	if eval $compile_ok && $run ./try > /dev/null; then
+		eval `$run ./try`
+		echo "Your integers are $intsize bytes long."
+		echo "Your long integers are $longsize bytes long."
+		echo "Your short integers are $shortsize bytes long."
+	else
+		$cat >&4 <<EOM
+!
+Help! I can't compile and run the intsize test program: please enlighten me!
+(This is probably a misconfiguration in your system or libraries, and
+you really ought to fix it.  Still, I'll try anyway.)
+!
+EOM
+		dflt=4
+		rp="What is the size of an integer (in bytes)?"
+		. ./myread
+		intsize="$ans"
+		dflt=$intsize
+		rp="What is the size of a long integer (in bytes)?"
+		. ./myread
+		longsize="$ans"
+		dflt=2
+		rp="What is the size of a short integer (in bytes)?"
+		. ./myread
+		shortsize="$ans"
+	fi
+	;;
+esac
+$rm -f try try.*
+
+: check for long long
+echo " "
+echo "Checking to see if you have long long..." >&4
+echo 'int main() { long long x = 7; return 0; }' > try.c
 set try
 if eval $compile; then
-	echo "<inttypes.h> found." >&4
 	val="$define"
+	echo "You have long long."
 else
-	echo "<inttypes.h> NOT found." >&4
 	val="$undef"
+	echo "You do not have long long."
 fi
-$rm -f try.c try
-set i_inttypes
+$rm try.*
+set d_longlong
 eval $setvar
 
-: check for int64_t
-echo " "
-echo "Checking to see if you have int64_t..." >&4
-$cat >try.c <<EOCP
-#include <sys/types.h>
-#$i_inttypes I_INTTYPES
-#ifdef I_INTTYPES
-#include <inttypes.h>
-#endif
-int main() { int64_t x = 7; }
+: check for length of long long
+case "${d_longlong}${longlongsize}" in
+$define)
+	echo " "
+	echo "Checking to see how big your long longs are..." >&4
+	$cat >try.c <<'EOCP'
+#include <stdio.h>
+int main()
+{
+    printf("%d\n", (int)sizeof(long long));
+    return(0);
+}
+EOCP
+	set try
+	if eval $compile_ok; then
+		longlongsize=`$run ./try`
+		echo "Your long longs are $longlongsize bytes long."
+	else
+		dflt='8'
+		echo " "
+		echo "(I can't seem to compile the test program.  Guessing...)"
+		rp="What is the size of a long long (in bytes)?"
+		. ./myread
+		longlongsize="$ans"
+	fi
+	if $test "X$longsize" = "X$longlongsize"; then
+		echo "(That isn't any different from an ordinary long.)"
+	fi	
+	;;
+esac
+$rm -f try.* try
+
+: see if inttypes.h is available
+: we want a real compile instead of Inhdr because some systems
+: have an inttypes.h which includes non-existent headers
+echo " "
+$cat >try.c <<EOCP
+#include <inttypes.h>
+int main() {
+	static int32_t foo32 = 0x12345678;
+}
+EOCP
+set try
+if eval $compile; then
+	echo "<inttypes.h> found." >&4
+	val="$define"
+else
+	echo "<inttypes.h> NOT found." >&4
+	val="$undef"
+fi
+$rm -f try.c try
+set i_inttypes
+eval $setvar
+
+: check for int64_t
+echo " "
+echo "Checking to see if you have int64_t..." >&4
+$cat >try.c <<EOCP
+#include <sys/types.h>
+#$i_inttypes I_INTTYPES
+#ifdef I_INTTYPES
+#include <inttypes.h>
+#endif
+int main() { int64_t x = 7; }
 EOCP
 set try
 if eval $compile; then
@@ -5230,40 +5510,15 @@ EOM
 	;;
 esac
 
-case "$use64bitall" in
-"$define"|true|[yY]*)
-	case "$ptrsize" in
-	4)	cat <<EOM >&4
-
-*** You have chosen a maximally 64-bit build, but your pointers
-*** are only 4 bytes wide, disabling maximal 64-bitness.
-
-EOM
-		use64bitall="$undef"
-		case "$use64bitint" in
-		"$define"|true|[yY]*) ;;
-		*)	cat <<EOM >&4
-
-*** Downgrading from maximal 64-bitness to using 64-bit integers.
-
-EOM
-			use64bitint="$define"
-			;;
-		esac
-		;;
-	esac
-	;;
-esac
-
-case "$use64bitint" in
-"$define"|true|[yY]*)
 : Look for a hint-file generated 'call-back-unit'.  If the
 : user has specified that a 64-bit perl is to be built,
 : we may need to set or change some other defaults.
-	if $test -f use64bitint.cbu; then
-		echo "Your platform has some specific hints for 64-bit integers, using them..."
-		. ./use64bitint.cbu
-	fi
+if $test -f use64bitint.cbu; then
+	echo "Your platform has some specific hints regarding 64-bit integers, using them..."
+	. ./use64bitint.cbu
+fi
+case "$use64bitint" in
+"$define"|true|[yY]*)
 	case "$longsize" in
 	4) case "$archname64" in
 	   '') archname64=64int ;;
@@ -5273,15 +5528,15 @@ case "$use64bitint" in
 	;;
 esac
 
-case "$use64bitall" in
-"$define"|true|[yY]*)
 : Look for a hint-file generated 'call-back-unit'.  If the
 : user has specified that a maximally 64-bit perl is to be built,
 : we may need to set or change some other defaults.
-	if $test -f use64bitall.cbu; then
-		echo "Your platform has some specific hints for 64-bit builds, using them..."
-		. ./use64bitall.cbu
-	fi
+if $test -f use64bitall.cbu; then
+	echo "Your platform has some specific hints regarding 64-bit builds, using them..."
+	. ./use64bitall.cbu
+fi
+case "$use64bitall" in
+"$define"|true|[yY]*)
 	case "$longsize" in
 	4) case "$archname64" in
 	   ''|64int) archname64=64all ;;
@@ -5291,993 +5546,267 @@ case "$use64bitall" in
 	;;
 esac
 
+case "$d_quad:$use64bitint" in
+$undef:$define)
+	cat >&4 <<EOF
+
+*** You have chosen to use 64-bit integers,
+*** but none can be found.
+*** Please rerun Configure without -Duse64bitint and/or -Dusemorebits.
+*** Cannot continue, aborting.
+
+EOF
+	exit 1
+	;;
+esac
+
+: check for length of double
 echo " "
-echo "Checking for GNU C Library..." >&4
-cat >try.c <<EOM
+case "$doublesize" in
+'')
+	echo "Checking to see how big your double precision numbers are..." >&4
+	$cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main()
 {
-#ifdef __GLIBC__
+    printf("%d\n", (int)sizeof(double));
     exit(0);
-#else
-    exit(1);
-#endif
 }
-EOM
+EOCP
+	set try
+	if eval $compile_ok; then
+		doublesize=`$run ./try`
+		echo "Your double is $doublesize bytes long."
+	else
+		dflt='8'
+		echo "(I can't seem to compile the test program.  Guessing...)"
+		rp="What is the size of a double precision number (in bytes)?"
+		. ./myread
+		doublesize="$ans"
+	fi
+	;;
+esac
+$rm -f try.c try
+
+: check for long doubles
+echo " "
+echo "Checking to see if you have long double..." >&4
+echo 'int main() { long double x = 7.0; }' > try.c
 set try
-if eval $compile_ok && $run ./try; then
+if eval $compile; then
 	val="$define"
-	echo "You are using the GNU C Library"
+	echo "You have long double."
 else
 	val="$undef"
-	echo "You are not using the GNU C Library"
+	echo "You do not have long double."
 fi
-$rm -f try try.*
-set d_gnulibc
+$rm try.*
+set d_longdbl
 eval $setvar
 
-: see if nm is to be used to determine whether a symbol is defined or not
-case "$usenm" in
-'')
-	dflt=''
-	case "$d_gnulibc" in
-	"$define")
+: check for length of long double
+case "${d_longdbl}${longdblsize}" in
+$define)
+	echo " "
+	echo "Checking to see how big your long doubles are..." >&4
+	$cat >try.c <<'EOCP'
+#include <stdio.h>
+int main()
+{
+	printf("%d\n", sizeof(long double));
+}
+EOCP
+	set try
+	set try
+	if eval $compile; then
+		longdblsize=`$run ./try`
+		echo "Your long doubles are $longdblsize bytes long."
+	else
+		dflt='8'
 		echo " "
-		echo "nm probably won't work on the GNU C Library." >&4
-		dflt=n
-		;;
-	esac
-	case "$dflt" in
-	'') 
-		if $test "$osname" = aix -a ! -f /lib/syscalls.exp; then
-			echo " "
-			echo "Whoops!  This is an AIX system without /lib/syscalls.exp!" >&4
-			echo "'nm' won't be sufficient on this sytem." >&4
-			dflt=n
-		fi
-		;;
-	esac
-	case "$dflt" in
-	'') dflt=`$egrep 'inlibc|csym' $rsrc/Configure | wc -l 2>/dev/null`
-		if $test $dflt -gt 20; then
-			dflt=y
-		else
-			dflt=n
-		fi
-		;;
-	esac
+		echo "(I can't seem to compile the test program.  Guessing...)" >&4
+		rp="What is the size of a long double (in bytes)?"
+		. ./myread
+		longdblsize="$ans"
+	fi
+	if $test "X$doublesize" = "X$longdblsize"; then
+		echo "That isn't any different from an ordinary double."
+		echo "I'll keep your setting anyway, but you may see some"
+		echo "harmless compilation warnings."
+	fi	
 	;;
+esac
+$rm -f try.* try
+
+: determine the architecture name
+echo " "
+if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then
+	tarch=`arch`"-$osname"
+elif xxx=`./loc uname blurfl $pth`; $test -f "$xxx" ; then
+	if uname -m > tmparch 2>&1 ; then
+		tarch=`$sed -e 's/ *$//' -e 's/ /_/g' \
+			-e 's/$/'"-$osname/" tmparch`
+	else
+		tarch="$osname"
+	fi
+	$rm -f tmparch
+else
+	tarch="$osname"
+fi
+case "$myarchname" in
+''|"$tarch") ;;
 *)
-	case "$usenm" in
-	true|$define) dflt=y;;
-	*) dflt=n;;
-	esac
+	echo "(Your architecture name used to be $myarchname.)"
+	archname=''
 	;;
 esac
-$cat <<EOM
-
-I can use $nm to extract the symbols from your C libraries. This
-is a time consuming task which may generate huge output on the disk (up
-to 3 megabytes) but that should make the symbols extraction faster. The
-alternative is to skip the 'nm' extraction part and to compile a small
-test program instead to determine whether each symbol is present. If
-you have a fast C compiler and/or if your 'nm' output cannot be parsed,
-this may be the best solution.
-
-You probably shouldn't let me use 'nm' if you are using the GNU C Library.
-
-EOM
-rp="Shall I use $nm to extract C symbols from the libraries?"
-. ./myread
-case "$ans" in
-[Nn]*) usenm=false;;
-*) usenm=true;;
+case "$targetarch" in
+'') ;;
+*)  archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;;
 esac
-
-runnm=$usenm
-case "$reuseval" in
-true) runnm=false;;
+myarchname="$tarch"
+case "$archname" in
+'') dflt="$tarch";;
+*) dflt="$archname";;
 esac
-
-: nm options which may be necessary
-case "$nm_opt" in
-'') if $test -f /mach_boot; then
-		nm_opt=''	# Mach
-	elif $test -d /usr/ccs/lib; then
-		nm_opt='-p'	# Solaris (and SunOS?)
-	elif $test -f /dgux; then
-		nm_opt='-p'	# DG-UX
-	elif $test -f /lib64/rld; then
-		nm_opt='-p'	# 64-bit Irix
-	else
-		nm_opt=''
-	fi;;
+rp='What is your architecture name'
+. ./myread
+archname="$ans"
+case "$usethreads" in
+$define)
+	echo "Threads selected." >&4
+	case "$archname" in
+        *-thread*) echo "...and architecture name already has -thread." >&4
+                ;;
+        *)      archname="$archname-thread"
+                echo "...setting architecture name to $archname." >&4
+                ;;
+        esac
+	;;
 esac
-
-: nm options which may be necessary for shared libraries but illegal
-: for archive libraries.  Thank you, Linux.
-case "$nm_so_opt" in
-'')	case "$myuname" in
-	*linux*)
-		if $nm --help | $grep 'dynamic' > /dev/null 2>&1; then
-			nm_so_opt='--dynamic'
-		fi
-		;;
-	esac
+case "$usemultiplicity" in
+$define)
+	echo "Multiplicity selected." >&4
+	case "$archname" in
+        *-multi*) echo "...and architecture name already has -multi." >&4
+                ;;
+        *)      archname="$archname-multi"
+                echo "...setting architecture name to $archname." >&4
+                ;;
+        esac
 	;;
 esac
-
-case "$runnm" in
-true)
-: get list of predefined functions in a handy place
-echo " "
-case "$libc" in
-'') libc=unknown
-	case "$libs" in
-	*-lc_s*) libc=`./loc libc_s$_a $libc $libpth`
+case "$use64bitint$use64bitall" in
+*"$define"*)
+	case "$archname64" in
+	'')
+		echo "This architecture is naturally 64-bit, not changing architecture name." >&4
+		;;
+	*)
+		case "$use64bitint" in
+		"$define") echo "64 bit integers selected." >&4 ;;
+		esac
+		case "$use64bitall" in
+		"$define") echo "Maximal 64 bitness selected." >&4 ;;
+		esac
+		case "$archname" in
+	        *-$archname64*) echo "...and architecture name already has $archname64." >&4
+	                ;;
+	        *)      archname="$archname-$archname64"
+	                echo "...setting architecture name to $archname." >&4
+	                ;;
+	        esac
+		;;
 	esac
-	;;
 esac
-case "$libs" in
-'') ;;
-*)  for thislib in $libs; do
-	case "$thislib" in
-	-lc|-lc_s)
-		: Handle C library specially below.
+case "$uselongdouble" in
+$define)
+	echo "Long doubles selected." >&4
+	case "$longdblsize" in
+	$doublesize)
+		echo "...but long doubles are equal to doubles, not changing architecture name." >&4
 		;;
-	-l*)
-		thislib=`echo $thislib | $sed -e 's/^-l//'`
-		if try=`./loc lib$thislib.$so.'*' X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc lib$thislib$_a X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc $thislib$_a X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc lib$thislib X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
-			:
-		elif try=`./loc Slib$thislib$_a X $xlibpth`; $test -f "$try"; then
-			:
-		else
-			try=''
-		fi
-		libnames="$libnames $try"
+	*)
+		case "$archname" in
+	        *-ld*) echo "...and architecture name already has -ld." >&4
+	                ;;
+	        *)      archname="$archname-ld"
+	                echo "...setting architecture name to $archname." >&4
+        	        ;;
+	        esac
 		;;
-	*) libnames="$libnames $thislib" ;;
 	esac
-	done
 	;;
 esac
-xxx=normal
-case "$libc" in
-unknown)
-	set /lib/libc.$so
-	for xxx in $libpth; do
-		$test -r $1 || set $xxx/libc.$so
-		: The messy sed command sorts on library version numbers.
-		$test -r $1 || \
-			set `echo blurfl; echo $xxx/libc.$so.[0-9]* | \
-			tr ' ' $trnl | egrep -v '\.[A-Za-z]*$' | $sed -e '
-				h
-				s/[0-9][0-9]*/0000&/g
-				s/0*\([0-9][0-9][0-9][0-9][0-9]\)/\1/g
-				G
-				s/\n/ /' | \
-			 $sort | $sed -e 's/^.* //'`
-		eval set \$$#
-	done
-	$test -r $1 || set /usr/ccs/lib/libc.$so
-	$test -r $1 || set /lib/libsys_s$_a
+case "$useperlio" in
+$define)
+	echo "Perlio selected." >&4
 	;;
 *)
-	set blurfl
+	echo "Perlio not selected, using stdio." >&4
+	case "$archname" in
+        *-stdio*) echo "...and architecture name already has -stdio." >&4
+                ;;
+        *)      archname="$archname-stdio"
+                echo "...setting architecture name to $archname." >&4
+                ;;
+        esac
 	;;
 esac
-if $test -r "$1"; then
-	echo "Your (shared) C library seems to be in $1."
-	libc="$1"
-elif $test -r /lib/libc && $test -r /lib/clib; then
-	echo "Your C library seems to be in both /lib/clib and /lib/libc."
-	xxx=apollo
-	libc='/lib/clib /lib/libc'
-	if $test -r /lib/syslib; then
-		echo "(Your math library is in /lib/syslib.)"
-		libc="$libc /lib/syslib"
-	fi
-elif $test -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
-	echo "Your C library seems to be in $libc, as you said before."
-elif $test -r $incpath/usr/lib/libc$_a; then
-	libc=$incpath/usr/lib/libc$_a;
-	echo "Your C library seems to be in $libc.  That's fine."
-elif $test -r /lib/libc$_a; then
-	libc=/lib/libc$_a;
-	echo "Your C library seems to be in $libc.  You're normal."
-else
-	if tans=`./loc libc$_a blurfl/dyick $libpth`; $test -r "$tans"; then
-		:
-	elif tans=`./loc libc blurfl/dyick $libpth`; $test -r "$tans"; then
-		libnames="$libnames "`./loc clib blurfl/dyick $libpth`
-	elif tans=`./loc clib blurfl/dyick $libpth`; $test -r "$tans"; then
-		:
-	elif tans=`./loc Slibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
-		:
-	elif tans=`./loc Mlibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
-		:
-	else
-		tans=`./loc Llibc$_a blurfl/dyick $xlibpth`
-	fi
-	if $test -r "$tans"; then
-		echo "Your C library seems to be in $tans, of all places."
-		libc=$tans
-	else
-		libc='blurfl'
-	fi
+if $test -f archname.cbu; then
+	echo "Your platform has some specific hints for architecture name, using them..."
+	. ./archname.cbu
 fi
-if $test $xxx = apollo -o -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
-	dflt="$libc"
-	cat <<EOM
-
-If the guess above is wrong (which it might be if you're using a strange
-compiler, or your machine supports multiple models), you can override it here.
-
-EOM
-else
-	dflt=''
-	echo $libpth | $tr ' ' $trnl | $sort | $uniq > libpath
-	cat >&4 <<EOM
-I can't seem to find your C library.  I've looked in the following places:
 
-EOM
-	$sed 's/^/	/' libpath
-	cat <<EOM
+: determine root of directory hierarchy where package will be installed.
+case "$prefix" in
+'')
+	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
+	;;
+*?/)
+	dflt=`echo "$prefix" | sed 's/.$//'`
+	;;
+*)
+	dflt="$prefix"
+	;;
+esac
+$cat <<EOM
 
-None of these seems to contain your C library. I need to get its name...
+By default, $package will be installed in $dflt/bin, manual pages
+under $dflt/man, etc..., i.e. with $dflt as prefix for all
+installation directories. Typically this is something like /usr/local.
+If you wish to have binaries under /usr/bin but other parts of the
+installation under /usr/local, that's ok: you will be prompted
+separately for each of the installation directories, the prefix being
+only used to set the defaults.
 
 EOM
-fi
-fn=f
-rp='Where is your C library?'
+fn=d~
+rp='Installation prefix to use?'
 . ./getfile
-libc="$ans"
+oldprefix=''
+case "$prefix" in
+'') ;;
+*)
+	case "$ans" in
+	"$prefix") ;;
+	*) oldprefix="$prefix";;
+	esac
+	;;
+esac
+prefix="$ans"
+prefixexp="$ansexp"
+
+case "$afsroot" in
+'')	afsroot=/afs ;;
+*)	afsroot=$afsroot ;;
+esac
 
-echo " "
-echo $libc $libnames | $tr ' ' $trnl | $sort | $uniq > libnames
-set X `cat libnames`
-shift
-xxx=files
-case $# in 1) xxx=file; esac
-echo "Extracting names from the following $xxx for later perusal:" >&4
-echo " "
-$sed 's/^/	/' libnames >&4
-echo " "
-$echo $n "This may take a while...$c" >&4
-
-for file in $*; do
-	case $file in
-	*$so*) $nm $nm_so_opt $nm_opt $file 2>/dev/null;;
-	*) $nm $nm_opt $file 2>/dev/null;;
-	esac
-done >libc.tmp
-
-$echo $n ".$c"
-$grep fprintf libc.tmp > libc.ptf
-xscan='eval "<libc.ptf $com >libc.list"; $echo $n ".$c" >&4'
-xrun='eval "<libc.tmp $com >libc.list"; echo "done" >&4'
-xxx='[ADTSIW]'
-if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx  *_[_.]*//p' -e 's/^.* $xxx  *//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^__*//' -e 's/^\([a-zA-Z_0-9$]*\).*xtern.*/\1/p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e '/|UNDEF/d' -e '/FUNC..GL/s/^.*|__*//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^.* D __*//p' -e 's/^.* D //p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^_//' -e 's/^\([a-zA-Z_0-9]*\).*xtern.*text.*/\1/p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^.*|FUNC |GLOB .*|//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$grep '|' | $sed -n -e '/|COMMON/d' -e '/|DATA/d' \
-				-e '/ file/d' -e 's/^\([^ 	]*\).*/\1/p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^.*|FUNC |GLOB .*|//p' -e 's/^.*|FUNC |WEAK .*|//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^__//' -e '/|Undef/d' -e '/|Proc/s/ .*//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^.*|Proc .*|Text *| *//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e '/Def. Text/s/.* \([^ ]*\)\$/\1/p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="$sed -n -e 's/.*\.text n\ \ \ \.//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-elif com="sed -n -e 's/^__.*//' -e 's/[       ]*D[    ]*[0-9]*.*//p'";\
-	eval $xscan;\
-	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
-		eval $xrun
-else
-	$nm -p $* 2>/dev/null >libc.tmp
-	$grep fprintf libc.tmp > libc.ptf
-	if com="$sed -n -e 's/^.* [ADTSIW]  *_[_.]*//p' -e 's/^.* [ADTSIW] //p'";\
-		eval $xscan; $contains '^fprintf$' libc.list >/dev/null 2>&1
-	then
-		nm_opt='-p'
-		eval $xrun
-	else
-		echo " "
-		echo "$nm didn't seem to work right. Trying $ar instead..." >&4
-		com=''
-		if $ar t $libc > libc.tmp && $contains '^fprintf$' libc.tmp >/dev/null 2>&1; then
-			for thisname in $libnames $libc; do
-				$ar t $thisname >>libc.tmp
-			done
-			$sed -e "s/\\$_o\$//" < libc.tmp > libc.list
-			echo "Ok." >&4
-		elif test "X$osname" = "Xos2" && $ar tv $libc > libc.tmp; then
-			# Repeat libc to extract forwarders to DLL entries too
-			for thisname in $libnames $libc; do
-				$ar tv $thisname >>libc.tmp
-				# Revision 50 of EMX has bug in $ar.
-				# it will not extract forwarders to DLL entries
-				# Use emximp which will extract exactly them.
-				emximp -o tmp.imp $thisname \
-				    2>/dev/null && \
-				    $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \
-				    < tmp.imp >>libc.tmp
-				$rm tmp.imp
-			done
-			$sed -e "s/\\$_o\$//" -e 's/^ \+//' < libc.tmp > libc.list
-			echo "Ok." >&4
-		else
-			echo "$ar didn't seem to work right." >&4
-			echo "Maybe this is a Cray...trying bld instead..." >&4
-			if bld t $libc | $sed -e 's/.*\///' -e "s/\\$_o:.*\$//" > libc.list
-			then
-				for thisname in $libnames; do
-					bld t $libnames | \
-					$sed -e 's/.*\///' -e "s/\\$_o:.*\$//" >>libc.list
-					$ar t $thisname >>libc.tmp
-				done
-				echo "Ok." >&4
-			else
-				echo "That didn't work either.  Giving up." >&4
-				exit 1
-			fi
-		fi
-	fi
-fi
-nm_extract="$com"
-if $test -f /lib/syscalls.exp; then
-	echo " "
-	echo "Also extracting names from /lib/syscalls.exp for good ole AIX..." >&4
-	$sed -n 's/^\([^ 	]*\)[ 	]*syscall[0-9]*[ 	]*$/\1/p' /lib/syscalls.exp >>libc.list
-fi
-;;
-esac
-$rm -f libnames libpath
-
-: is a C symbol defined?
-csym='tlook=$1;
-case "$3" in
--v) tf=libc.tmp; tc=""; tdc="";;
--a) tf=libc.tmp; tc="[0]"; tdc="[]";;
-*) tlook="^$1\$"; tf=libc.list; tc="()"; tdc="()";;
-esac;
-tx=yes;
-case "$reuseval-$4" in
-true-) ;;
-true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
-esac;
-case "$tx" in
-yes)
-	case "$runnm" in
-	true)
-		if $contains $tlook $tf >/dev/null 2>&1;
-		then tval=true;
-		else tval=false;
-		fi;;
-	*)
-		echo "int main() { extern short $1$tdc; printf(\"%hd\", $1$tc); }" > t.c;
-		if $cc -o t $optimize $ccflags $ldflags t.c $libs >/dev/null 2>&1;
-		then tval=true;
-		else tval=false;
-		fi;
-		$rm -f t t.c;;
-	esac;;
-*)
-	case "$tval" in
-	$define) tval=true;;
-	*) tval=false;;
-	esac;;
-esac;
-eval "$2=$tval"'
-
-: define an is-in-libc? function
-inlibc='echo " "; td=$define; tu=$undef;
-sym=$1; var=$2; eval "was=\$$2";
-tx=yes;
-case "$reuseval$was" in
-true) ;;
-true*) tx=no;;
-esac;
-case "$tx" in
-yes)
-	set $sym tres -f;
-	eval $csym;
-	case "$tres" in
-	true)
-		echo "$sym() found." >&4;
-		case "$was" in $undef) . ./whoa; esac; eval "$var=\$td";;
-	*)
-		echo "$sym() NOT found." >&4;
-		case "$was" in $define) . ./whoa; esac; eval "$var=\$tu";;
-	esac;;
-*)
-	case "$was" in
-	$define) echo "$sym() found." >&4;;
-	*) echo "$sym() NOT found." >&4;;
-	esac;;
-esac'
-
-: see if sqrtl exists
-set sqrtl d_sqrtl
-eval $inlibc
-
-: check for length of double
-echo " "
-case "$doublesize" in
-'')
-	echo "Checking to see how big your double precision numbers are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-    printf("%d\n", (int)sizeof(double));
-    exit(0);
-}
-EOCP
-	set try
-	if eval $compile_ok; then
-		doublesize=`$run ./try`
-		echo "Your double is $doublesize bytes long."
-	else
-		dflt='8'
-		echo "(I can't seem to compile the test program.  Guessing...)"
-		rp="What is the size of a double precision number (in bytes)?"
-		. ./myread
-		doublesize="$ans"
-	fi
-	;;
-esac
-$rm -f try.c try
-
-: check for long doubles
-echo " "
-echo "Checking to see if you have long double..." >&4
-echo 'int main() { long double x = 7.0; }' > try.c
-set try
-if eval $compile; then
-	val="$define"
-	echo "You have long double."
-else
-	val="$undef"
-	echo "You do not have long double."
-fi
-$rm try.*
-set d_longdbl
-eval $setvar
-
-: check for length of long double
-case "${d_longdbl}${longdblsize}" in
-$define)
-	echo " "
-	echo "Checking to see how big your long doubles are..." >&4
-	$cat >try.c <<'EOCP'
-#include <stdio.h>
-int main()
-{
-	printf("%d\n", sizeof(long double));
-}
-EOCP
-	set try
-	set try
-	if eval $compile; then
-		longdblsize=`$run ./try`
-		echo "Your long doubles are $longdblsize bytes long."
-	else
-		dflt='8'
-		echo " "
-		echo "(I can't seem to compile the test program.  Guessing...)" >&4
-		rp="What is the size of a long double (in bytes)?"
-		. ./myread
-		longdblsize="$ans"
-	fi
-	if $test "X$doublesize" = "X$longdblsize"; then
-		echo "(That isn't any different from an ordinary double.)"
-	fi	
-	;;
-esac
-$rm -f try.* try
-
-echo " "
-
-if $test X"$d_longdbl" = X"$define"; then
-
-echo "Checking how to print long doubles..." >&4
-
-if $test X"$sPRIfldbl" = X -a X"$doublesize" = X"$longdblsize"; then
-	$cat >try.c <<'EOCP'
-#include <sys/types.h>
-#include <stdio.h>
-int main() {
-  double d = 123.456;
-  printf("%.3f\n", d);
-}
-EOCP
-	set try
-	if eval $compile; then
-		yyy=`$run ./try`
-		case "$yyy" in
-		123.456)
-			sPRIfldbl='"f"'; sPRIgldbl='"g"'; sPRIeldbl='"e"';
-                	sPRIFUldbl='"F"'; sPRIGUldbl='"G"'; sPRIEUldbl='"E"';
-			echo "We will use %f."
-			;;
-		esac
-	fi
-fi
-
-if $test X"$sPRIfldbl" = X; then
-	$cat >try.c <<'EOCP'
-#include <sys/types.h>
-#include <stdio.h>
-int main() {
-  long double d = 123.456;
-  printf("%.3Lf\n", d);
-}
-EOCP
-	set try
-	if eval $compile; then
-		yyy=`$run ./try`
-		case "$yyy" in
-		123.456)
-			sPRIfldbl='"Lf"'; sPRIgldbl='"Lg"'; sPRIeldbl='"Le"';
-                	sPRIFUldbl='"LF"'; sPRIGUldbl='"LG"'; sPRIEUldbl='"LE"';
-			echo "We will use %Lf."
-			;;
-		esac
-	fi
-fi
-
-if $test X"$sPRIfldbl" = X; then
-	$cat >try.c <<'EOCP'
-#include <sys/types.h>
-#include <stdio.h>
-int main() {
-  long double d = 123.456;
-  printf("%.3llf\n", d);
-}
-EOCP
-	set try
-	if eval $compile; then
-		yyy=`$run ./try`
-		case "$yyy" in
-		123.456)
-			sPRIfldbl='"llf"'; sPRIgldbl='"llg"'; sPRIeldbl='"lle"';
-                	sPRIFUldbl='"llF"'; sPRIGUldbl='"llG"'; sPRIEUldbl='"llE"';
-			echo "We will use %llf."
-			;;
-		esac
-	fi
-fi
-
-if $test X"$sPRIfldbl" = X; then
-	$cat >try.c <<'EOCP'
-#include <sys/types.h>
-#include <stdio.h>
-int main() {
-  long double d = 123.456;
-  printf("%.3lf\n", d);
-}
-EOCP
-	set try
-	if eval $compile; then
-		yyy=`$run ./try`
-		case "$yyy" in
-		123.456)
-			sPRIfldbl='"lf"'; sPRIgldbl='"lg"'; sPRIeldbl='"le"';
-                	sPRIFUldbl='"lF"'; sPRIGUldbl='"lG"'; sPRIEUldbl='"lE"';
-			echo "We will use %lf."
-			;;
-		esac
-	fi
-fi
-
-if $test X"$sPRIfldbl" = X; then
-	echo "Cannot figure out how to print long doubles." >&4
-else
-	sSCNfldbl=$sPRIfldbl	# expect consistency
-fi
-
-$rm -f try try.*
-
-fi # d_longdbl
-
-case "$sPRIfldbl" in
-'')	d_PRIfldbl="$undef"; d_PRIgldbl="$undef"; d_PRIeldbl="$undef"; 
-	d_PRIFUldbl="$undef"; d_PRIGUldbl="$undef"; d_PRIEUldbl="$undef"; 
-	d_SCNfldbl="$undef";
-	;;
-*)	d_PRIfldbl="$define"; d_PRIgldbl="$define"; d_PRIeldbl="$define"; 
-	d_PRIFUldbl="$define"; d_PRIGUldbl="$define"; d_PRIEUldbl="$define"; 
-	d_SCNfldbl="$define";
-	;;
-esac
-
-: see if modfl exists
-set modfl d_modfl
-eval $inlibc
-
-d_modfl_pow32_bug="$undef"
-
-case "$d_longdbl$d_modfl" in
-$define$define)
-	$cat <<EOM
-Checking to see whether your modfl() is okay for large values...
-EOM
-$cat >try.c <<EOCP
-#include <math.h> 
-#include <stdio.h>
-int main() {
-    long double nv = 4294967303.15;
-    long double v, w;
-    v = modfl(nv, &w);         
-#ifdef __GLIBC__
-    printf("glibc");
-#endif
-    printf(" %"$sPRIfldbl" %"$sPRIfldbl" %"$sPRIfldbl"\n", nv, v, w);
-    return 0;
-}
-EOCP
-	case "$osname:$gccversion" in
-	aix:)	saveccflags="$ccflags"
-		ccflags="$ccflags -qlongdouble" ;; # to avoid core dump
-	esac
-	set try
-	if eval $compile; then
-		foo=`$run ./try`
-		case "$foo" in
-		*" 4294967303.150000 1.150000 4294967302.000000")
-			echo >&4 "Your modfl() is broken for large values."
-			d_modfl_pow32_bug="$define"
-			case "$foo" in
-			glibc)	echo >&4 "You should upgrade your glibc to at least 2.2.2 to get a fixed modfl()."
-			;;
-			esac
-			;;
-		*" 4294967303.150000 0.150000 4294967303.000000")
-			echo >&4 "Your modfl() seems okay for large values."
-			;;
-		*)	echo >&4 "I don't understand your modfl() at all."
-			d_modfl="$undef"
-			;;
-		esac
-		$rm -f try.* try core core.try.*
-	else
-		echo "I cannot figure out whether your modfl() is okay, assuming it isn't."
-		d_modfl="$undef"
-	fi
-	case "$osname:$gccversion" in
-	aix:)	ccflags="$saveccflags" ;; # restore
-	esac
-	;;
-esac
-
-case "$ccflags" in
-*-DUSE_LONG_DOUBLE*|*-DUSE_MORE_BITS*) uselongdouble="$define" ;;
-esac
-
-case "$uselongdouble" in
-$define|true|[yY]*)	dflt='y';;
-*) dflt='n';;
-esac
-cat <<EOM
-
-Perl can be built to take advantage of long doubles which
-(if available) may give more accuracy and range for floating point numbers.
-
-If this doesn't make any sense to you, just accept the default '$dflt'.
-EOM
-rp='Try to use long doubles if available?'
-. ./myread
-case "$ans" in
-y|Y) 	val="$define"	;;
-*)      val="$undef"	;;
-esac
-set uselongdouble
-eval $setvar
-
-case "$uselongdouble" in
-true|[yY]*) uselongdouble="$define" ;;
-esac
-
-case "$uselongdouble" in
-$define)
-: Look for a hint-file generated 'call-back-unit'.  If the
-: user has specified that long doubles should be used,
-: we may need to set or change some other defaults.
-	if $test -f uselongdouble.cbu; then
-		echo "Your platform has some specific hints for long doubles, using them..."
-		. ./uselongdouble.cbu
-	else
-		$cat <<EOM
-(Your platform doesn't have any specific hints for long doubles.)
-EOM
-	fi
-	;;
-esac
-
-message=X
-case "$uselongdouble:$d_sqrtl:$d_modfl" in
-$define:$define:$define)
-	: You have both
-	;;
-$define:$define:$undef)
-	message="I could not find modfl"
-	;;
-$define:$undef:$define)
-	message="I could not find sqrtl"
-	;;
-$define:$undef:$undef)
-	message="I found neither sqrtl nor modfl"
-	;;
-esac
-
-if $test "$message" != X; then
-	$cat <<EOM >&4
-
-*** You requested the use of long doubles but you do not seem to have
-*** the mathematic functions for long doubles.
-*** ($message)
-*** I'm disabling the use of long doubles.
-
-EOM
-
-	uselongdouble=$undef
-fi
-
-case "$useperlio" in
-$define|true|[yY]*|'')	dflt='y';;
-*) dflt='n';;
-esac
-cat <<EOM
-
-Previous version of $package used the standard IO mechanisms as
-defined in <stdio.h>.  Versions 5.003_02 and later of $package allow
-alternate IO mechanisms via the PerlIO abstraction layer, but the
-stdio mechanism is still available if needed.  The abstraction layer
-can use AT&T's sfio (if you already have sfio installed) or regular stdio.
-Using PerlIO with sfio may cause problems with some extension modules.
-
-If this doesn't make any sense to you, just accept the default '$dflt'.
-EOM
-rp='Use the PerlIO abstraction layer?'
-. ./myread
-case "$ans" in
-y|Y) 
-	val="$define"
-	;;
-*)      
-	echo "Ok, doing things the stdio way."
-	val="$undef"
-	;;
-esac
-set useperlio
-eval $setvar 
-
-case "$usesocks" in
-$define|true|[yY]*)
-	case "$useperlio" in
-	$define|true|[yY]*) ;;
-	*)	cat >&4 <<EOM
-
-You are using the SOCKS proxy protocol library which means that you
-should also use the PerlIO layer.  You may be headed for trouble.
-
-EOM
-		;;
-	esac
-	;;
-esac
-
-	
-: determine the architecture name
-echo " "
-if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then
-	tarch=`arch`"-$osname"
-elif xxx=`./loc uname blurfl $pth`; $test -f "$xxx" ; then
-	if uname -m > tmparch 2>&1 ; then
-		tarch=`$sed -e 's/ *$//' -e 's/ /_/g' \
-			-e 's/$/'"-$osname/" tmparch`
-	else
-		tarch="$osname"
-	fi
-	$rm -f tmparch
-else
-	tarch="$osname"
-fi
-case "$myarchname" in
-''|"$tarch") ;;
-*)
-	echo "(Your architecture name used to be $myarchname.)"
-	archname=''
-	;;
-esac
-case "$targetarch" in
-'') ;;
-*)  archname=`echo $targetarch|sed 's,^[^-]*-,,'` ;;
-esac
-myarchname="$tarch"
-case "$archname" in
-'') dflt="$tarch";;
-*) dflt="$archname";;
-esac
-rp='What is your architecture name'
-. ./myread
-archname="$ans"
-case "$usethreads" in
-$define)
-	echo "Threads selected." >&4
-	case "$archname" in
-        *-thread*) echo "...and architecture name already has -thread." >&4
-                ;;
-        *)      archname="$archname-thread"
-                echo "...setting architecture name to $archname." >&4
-                ;;
-        esac
-	;;
-esac
-case "$usemultiplicity" in
-$define)
-	echo "Multiplicity selected." >&4
-	case "$archname" in
-        *-multi*) echo "...and architecture name already has -multi." >&4
-                ;;
-        *)      archname="$archname-multi"
-                echo "...setting architecture name to $archname." >&4
-                ;;
-        esac
-	;;
-esac
-case "$use64bitint$use64bitall" in
-*"$define"*)
-	case "$archname64" in
-	'')
-		echo "This architecture is naturally 64-bit, not changing architecture name." >&4
-		;;
-	*)
-		case "$use64bitint" in
-		"$define") echo "64 bit integers selected." >&4 ;;
-		esac
-		case "$use64bitall" in
-		"$define") echo "Maximal 64 bitness selected." >&4 ;;
-		esac
-		case "$archname" in
-	        *-$archname64*) echo "...and architecture name already has $archname64." >&4
-	                ;;
-	        *)      archname="$archname-$archname64"
-	                echo "...setting architecture name to $archname." >&4
-	                ;;
-	        esac
-		;;
-	esac
-esac
-case "$uselongdouble" in
-$define)
-	echo "Long doubles selected." >&4
-	case "$longdblsize" in
-	$doublesize)
-		echo "...but long doubles are equal to doubles, not changing architecture name." >&4
-		;;
-	*)
-		case "$archname" in
-	        *-ld*) echo "...and architecture name already has -ld." >&4
-	                ;;
-	        *)      archname="$archname-ld"
-	                echo "...setting architecture name to $archname." >&4
-        	        ;;
-	        esac
-		;;
-	esac
-	;;
-esac
-case "$useperlio" in
-$define)
-	echo "Perlio selected." >&4
-	;;
-*)
-	echo "Perlio not selected, using stdio." >&4
-	case "$archname" in
-        *-stdio*) echo "...and architecture name already has -stdio." >&4
-                ;;
-        *)      archname="$archname-stdio"
-                echo "...setting architecture name to $archname." >&4
-                ;;
-        esac
-	;;
-esac
-
-: determine root of directory hierarchy where package will be installed.
-case "$prefix" in
-'')
-	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
-	;;
-*)
-	dflt="$prefix"
-	;;
-esac
-$cat <<EOM
-
-By default, $package will be installed in $dflt/bin, manual pages
-under $dflt/man, etc..., i.e. with $dflt as prefix for all
-installation directories. Typically this is something like /usr/local.
-If you wish to have binaries under /usr/bin but other parts of the
-installation under /usr/local, that's ok: you will be prompted
-separately for each of the installation directories, the prefix being
-only used to set the defaults.
-
-EOM
-fn=d~
-rp='Installation prefix to use?'
-. ./getfile
-oldprefix=''
-case "$prefix" in
-'') ;;
-*)
-	case "$ans" in
-	"$prefix") ;;
-	*) oldprefix="$prefix";;
-	esac
-	;;
-esac
-prefix="$ans"
-prefixexp="$ansexp"
-
-case "$afsroot" in
-'')	afsroot=/afs ;;
-*)	afsroot=$afsroot ;;
-esac
-
-: is AFS running?
+: is AFS running?
 echo " "
 case "$afs" in
 $define|true)	afs=true ;;
@@ -6312,9 +5841,9 @@ else
 $cat <<EOM
 
 In some special cases, particularly when building $package for distribution,
-it is convenient to distinguish between the directory in which files should 
-be installed from the directory ($prefix) in which they 
-will eventually reside.  For most users, these two directories are the same.
+it is convenient to distinguish the directory in which files should be
+installed from the directory ($prefix) in which they will
+eventually reside.  For most users, these two directories are the same.
 
 EOM
 	case "$installprefix" in
@@ -6499,45 +6028,6 @@ else
 	installarchlib="$archlibexp"
 fi
 
-
-: Binary compatibility with 5.005 is not possible for builds
-: with advanced features
-case "$usethreads$usemultiplicity" in
-*define*)
-	bincompat5005="$undef"
-	d_bincompat5005="$undef"
-	;;
-*)	$cat <<EOM
-
-This version of Perl can be compiled for binary compatibility with 5.005.
-If you decide to do so, you will be able to continue using most of the
-extensions that were compiled for Perl 5.005.
-
-EOM
-	case "$bincompat5005$d_bincompat5005" in
-	*"$undef"*) dflt=n ;;
-	*) dflt=y ;;
-	esac
-	rp='Binary compatibility with Perl 5.005?'
-	. ./myread
-	case "$ans" in
-	y*) val="$define" ;;
-	*)  val="$undef" ;;
-	esac
-	set d_bincompat5005
-	eval $setvar
-	case "$d_bincompat5005" in
-	"$define")
-		bincompat5005="$define"
-		;;
-	*)	bincompat5005="$undef"
-		d_bincompat5005="$undef"
-		;;
-	esac
-	;;
-esac
-
-
 : see if setuid scripts can be secure
 $cat <<EOM
 
@@ -6645,16 +6135,210 @@ EOM
 	esac
 	;;
 esac
-set d_dosuid
-eval $setvar
+set d_dosuid
+eval $setvar
+
+: see if this is a malloc.h system
+: we want a real compile instead of Inhdr because some systems have a
+: malloc.h that just gives a compile error saying to use stdlib.h instead
+echo " "
+$cat >try.c <<EOCP
+#include <stdlib.h>
+#include <malloc.h>
+int main () { return 0; }
+EOCP
+set try
+if eval $compile; then
+    echo "<malloc.h> found." >&4
+    val="$define"
+else
+    echo "<malloc.h> NOT found." >&4
+    val="$undef"
+fi
+$rm -f try.c try
+set i_malloc
+eval $setvar
+
+: check for void type
+echo " "
+echo "Checking to see how well your C compiler groks the void type..." >&4
+case "$voidflags" in
+'')
+	$cat >try.c <<EOCP
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#if TRY & 1
+void sub() {
+#else
+sub() {
+#endif
+	extern void moo();	/* function returning void */
+	void (*goo)();		/* ptr to func returning void */
+#if TRY & 8
+	void *hue;		/* generic ptr */
+#endif
+#if TRY & 2
+	void (*foo[10])();
+#endif
+
+#if TRY & 4
+	if(goo == moo) {
+		exit(0);
+	}
+#endif
+	exit(0);
+}
+int main() { sub(); }
+EOCP
+	if $cc $ccflags -c -DTRY=$defvoidused try.c >.out 2>&1 ; then
+		voidflags=$defvoidused
+	echo "Good.  It appears to support void to the level $package wants.">&4
+		if $contains warning .out >/dev/null 2>&1; then
+			echo "However, you might get some warnings that look like this:"
+			$cat .out
+		fi
+	else
+echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4
+		if $cc $ccflags -c -DTRY=1 try.c >/dev/null 2>&1; then
+			echo "It supports 1..."
+			if $cc $ccflags -c -DTRY=3 try.c >/dev/null 2>&1; then
+				echo "It also supports 2..."
+				if $cc $ccflags -c -DTRY=7 try.c >/dev/null 2>&1; then
+					voidflags=7
+					echo "And it supports 4 but not 8 definitely."
+				else
+					echo "It doesn't support 4..."
+					if $cc $ccflags -c -DTRY=11 try.c >/dev/null 2>&1; then
+						voidflags=11
+						echo "But it supports 8."
+					else
+						voidflags=3
+						echo "Neither does it support 8."
+					fi
+				fi
+			else
+				echo "It does not support 2..."
+				if $cc $ccflags -c -DTRY=13 try.c >/dev/null 2>&1; then
+					voidflags=13
+					echo "But it supports 4 and 8."
+				else
+					if $cc $ccflags -c -DTRY=5 try.c >/dev/null 2>&1; then
+						voidflags=5
+						echo "And it supports 4 but has not heard about 8."
+					else
+						echo "However it supports 8 but not 4."
+					fi
+				fi
+			fi
+		else
+			echo "There is no support at all for void."
+			voidflags=0
+		fi
+	fi
+esac
+case "$voidflags" in
+"$defvoidused") ;;
+*)	$cat >&4 <<'EOM'
+  Support flag bits are:
+    1: basic void declarations.
+    2: arrays of pointers to functions returning void.
+    4: operations between pointers to and addresses of void functions.
+    8: generic void pointers.
+EOM
+	dflt="$voidflags";
+	rp="Your void support flags add up to what?"
+	. ./myread
+	voidflags="$ans"
+	;;
+esac
+$rm -f try.* .out
+
+: check for length of pointer
+echo " "
+case "$ptrsize" in
+'')
+	echo "Checking to see how big your pointers are..." >&4
+	if test "$voidflags" -gt 7; then
+		echo '#define VOID_PTR char *' > try.c
+	else
+		echo '#define VOID_PTR void *' > try.c
+	fi
+	$cat >>try.c <<EOCP
+#include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+int main()
+{
+    printf("%d\n", (int)sizeof(VOID_PTR));
+    exit(0);
+}
+EOCP
+	set try
+	if eval $compile_ok; then
+		ptrsize=`$run ./try`
+		echo "Your pointers are $ptrsize bytes long."
+	else
+		dflt='4'
+		echo "(I can't seem to compile the test program.  Guessing...)" >&4
+		rp="What is the size of a pointer (in bytes)?"
+		. ./myread
+		ptrsize="$ans"
+	fi
+	;;
+esac
+$rm -f try.c try
+case "$use64bitall" in
+"$define"|true|[yY]*)
+	case "$ptrsize" in
+	4)	cat <<EOM >&4
+
+*** You have chosen a maximally 64-bit build,
+*** but your pointers are only 4 bytes wide.
+*** Please rerun Configure without -Duse64bitall.
+EOM
+		case "$d_quad" in
+		define)
+			cat <<EOM >&4
+*** Since you have quads, you could possibly try with -Duse64bitint.
+EOM
+			;;
+		esac
+		cat <<EOM >&4
+*** Cannot continue, aborting.
+
+EOM
+
+		exit 1
+		;;
+	esac
+	;;
+esac
 
-: see if this is a malloc.h system
-set malloc.h i_malloc
-eval $inhdr
 
-: see if stdlib is available
-set stdlib.h i_stdlib
-eval $inhdr
+: determine whether to use malloc wrapping
+echo " "
+case "$usemallocwrap" in
+[yY]*|true|$define)	dflt='y' ;;
+[nN]*|false|$undef)	dflt='n' ;;
+*)	case "$usedevel" in
+	[yY]*|true|$define)	dflt='y' ;;
+	*) dflt='n' ;;
+	esac
+	;;
+esac
+rp="Do you wish to wrap malloc calls to protect against potential overflows?"
+. ./myread
+usemallocwrap="$ans"
+case "$ans" in
+y*|true)
+	usemallocwrap="$define" ;;
+*)
+	usemallocwrap="$undef" ;;
+esac
 
 : determine which malloc to compile in
 echo " "
@@ -6976,287 +6660,848 @@ case "$otherlibdirs" in
 *)	dflt="$otherlibdirs" ;;
 esac
 $cat <<EOM
-Enter a colon-separated set of extra paths to include in perl's @INC
-search path, or enter 'none' for no extra paths.
+Enter a colon-separated set of extra paths to include in perl's @INC
+search path, or enter 'none' for no extra paths.
+
+EOM
+
+rp='Colon-separated list of additional directories for perl to search?'
+. ./myread
+case "$ans" in
+' '|''|none)	otherlibdirs=' ' ;;     
+*)	otherlibdirs="$ans" ;;
+esac
+case "$otherlibdirs" in
+' ') val=$undef ;;
+*)	val=$define ;;
+esac
+set d_perl_otherlibdirs
+eval $setvar
+
+: Cruising for prototypes
+echo " "
+echo "Checking out function prototypes..." >&4
+$cat >prototype.c <<EOCP
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+int main(int argc, char *argv[]) {
+	exit(0);}
+EOCP
+if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then
+	echo "Your C compiler appears to support function prototypes."
+	val="$define"
+else
+	echo "Your C compiler doesn't seem to understand function prototypes."
+	val="$undef"
+fi
+set prototype
+eval $setvar
+$rm -f prototype*
+
+case "$prototype" in
+"$define") ;;
+*)	ansi2knr='ansi2knr'
+	echo " "
+	cat <<EOM >&4
+
+$me:  FATAL ERROR:
+This version of $package can only be compiled by a compiler that 
+understands function prototypes.  Unfortunately, your C compiler 
+	$cc $ccflags
+doesn't seem to understand them.  Sorry about that.
+
+If GNU cc is available for your system, perhaps you could try that instead.  
+
+Eventually, we hope to support building Perl with pre-ANSI compilers.
+If you would like to help in that effort, please contact <perlbug@perl.org>.
+
+Aborting Configure now.
+EOM
+	exit 2
+	;;
+esac
+
+: determine where public executables go
+echo " "
+set dflt bin bin
+eval $prefixit
+fn=d~
+rp='Pathname where the public executables will reside?'
+. ./getfile
+if $test "X$ansexp" != "X$binexp"; then
+	installbin=''
+fi
+bin="$ans"
+binexp="$ansexp"
+: Change installation prefix, if necessary.
+: XXX Bug? -- ignores Configure -Dinstallprefix setting.
+if $test X"$prefix" != X"$installprefix"; then
+	installbin=`echo $binexp | sed "s#^$prefix#$installprefix#"`
+else
+	installbin="$binexp"
+fi
+
+echo " "
+case "$extras" in
+'') dflt='n';;
+*) dflt='y';;
+esac
+cat <<EOM
+Perl can be built with extra modules or bundles of modules which
+will be fetched from the CPAN and installed alongside Perl.
+
+Notice that you will need access to the CPAN; either via the Internet,
+or a local copy, for example a CD-ROM or a local CPAN mirror.  (You will
+be asked later to configure the CPAN.pm module which will in turn do
+the installation of the rest of the extra modules or bundles.)
+
+Notice also that if the modules require any external software such as
+libraries and headers (the libz library and the zlib.h header for the
+Compress::Zlib module, for example) you MUST have any such software
+already installed, this configuration process will NOT install such
+things for you.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
+rp='Install any extra modules (y or n)?'
+. ./myread
+case "$ans" in
+y|Y)
+	cat <<EOM
+
+Please list any extra modules or bundles to be installed from CPAN,
+with spaces between the names.  The names can be in any format the
+'install' command of CPAN.pm will understand.  (Answer 'none',
+without the quotes, to install no extra modules or bundles.)
+EOM
+	rp='Extras?'
+	dflt="$extras"
+	. ./myread
+	extras="$ans"
+esac
+case "$extras" in
+''|'none')
+	val=''
+	$rm -f ../extras.lst
+	;;
+*)	echo "(Saving the list of extras for later...)"
+	echo "$extras" > ../extras.lst
+	val="'$extras'"
+	;;
+esac
+set extras
+eval $setvar
+echo " "
+
+: determine where html pages for programs go
+set html1dir html1dir none
+eval $prefixit
+$cat <<EOM
+
+If you wish to install html files for programs in $spackage, indicate 
+the appropriate directory here.  To skip installing html files,
+answer "none".
+EOM
+case "$html1dir" in
+''|none|$undef|' ') dflt=none ;;
+*) dflt=$html1dir ;;
+esac
+fn=dn+~
+rp="Directory for the main $spackage html pages?"
+. ./getfile
+html1dir="$ans"
+html1direxp="$ansexp"
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$html1dir" = "X" && html1dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installhtml1dir=`echo $html1direxp | sed "s#^$prefix#$installprefix#"`
+else
+	installhtml1dir="$html1direxp"
+fi
+
+: determine where html pages for libraries and modules go
+set html3dir html3dir none
+eval $prefixit
+$cat <<EOM
+
+If you wish to install html files for modules associated with $spackage,
+indicate the appropriate directory here.  To skip installing html files,
+answer "none".
+EOM
+: There is no obvious default.  If they have specified html1dir, then
+: try to key off that, possibly changing .../html1 into .../html3.
+case "$html3dir" in
+'') html3dir=`echo "$html1dir" | $sed 's/1$/3$/'` ;;
+*) dflt=$html3dir ;;
+esac
+fn=dn+~
+rp="Directory for the $spackage module html pages?"
+. ./getfile
+html3dir="$ans"
+html3direxp="$ansexp"
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$html3dir" = "X" && html3dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installhtml3dir=`echo $html3direxp | sed "s#^$prefix#$installprefix#"`
+else
+	installhtml3dir="$html3direxp"
+fi
+
+: Find perl5.005 or later.
+echo "Looking for a previously installed perl5.005 or later... "
+case "$perl5" in
+'')	for tdir in `echo "$binexp$path_sep$PATH" | $sed "s/$path_sep/ /g"`; do
+		: Check if this perl is recent and can load a simple module
+		if $test -x $tdir/perl$exe_ext && $tdir/perl -Mless -e 'use 5.005;' >/dev/null 2>&1; then
+			perl5=$tdir/perl
+			break;
+		elif $test -x $tdir/perl5$exe_ext && $tdir/perl5 -Mless -e 'use 5.005;' >/dev/null 2>&1; then
+			perl5=$tdir/perl5
+			break;
+		fi
+	done
+	;;
+*)	perl5="$perl5"
+	;;
+esac
+case "$perl5" in
+'')	echo "None found.  That's ok.";;
+*)	echo "Using $perl5." ;;
+esac
+
+: Determine list of previous versions to include in @INC
+$cat > getverlist <<EOPL
+#!$perl5 -w
+use File::Basename;
+\$api_versionstring = "$api_versionstring";
+\$version = "$version";
+\$stem = "$sitelib_stem";
+\$archname = "$archname";
+EOPL
+	$cat >> getverlist <<'EOPL'
+# Can't have leading @ because metaconfig interprets it as a command!
+;@inc_version_list=();
+# XXX Redo to do opendir/readdir? 
+if (-d $stem) {
+    chdir($stem);
+    ;@candidates = glob("5.*");
+}
+else {
+    ;@candidates = ();
+}
+
+# XXX ToDo:  These comparisons must be reworked when two-digit
+# subversions come along, so that 5.7.10 compares as greater than
+# 5.7.3!  By that time, hope that 5.6.x is sufficiently
+# widespread that we can use the built-in version vectors rather
+# than reinventing them here.  For 5.6.0, however, we must
+# assume this script will likely be run by 5.005_0x.  --AD 1/2000.
+foreach $d (@candidates) {
+    if ($d lt $version) {
+	if ($d ge $api_versionstring) {
+	    unshift(@inc_version_list, grep { -d } "$d/$archname", $d);
+	}
+	elsif ($d ge "5.005") {
+	    unshift(@inc_version_list, grep { -d } $d);
+	}
+    }
+    else {
+	# Skip newer version.  I.e. don't look in
+	# 5.7.0 if we're installing 5.6.1.
+    }
+}
+
+if (@inc_version_list) {
+    print join(' ', @inc_version_list);
+}
+else {
+    # Blank space to preserve value for next Configure run.
+    print " ";
+}
+EOPL
+chmod +x getverlist
+case "$inc_version_list" in
+'')	if test -x "$perl5$exe_ext"; then
+		dflt=`$perl5 getverlist`
+	else
+		dflt='none'
+	fi
+	;;
+$undef) dflt='none' ;;
+*)  eval dflt=\"$inc_version_list\" ;;
+esac
+case "$dflt" in
+''|' ') dflt=none ;;
+esac
+case "$dflt" in
+5.005) dflt=none ;;
+esac
+$cat <<EOM
+
+In order to ease the process of upgrading, this version of perl 
+can be configured to use modules built and installed with earlier 
+versions of perl that were installed under $prefix.  Specify here
+the list of earlier versions that this version of perl should check.
+If Configure detected no earlier versions of perl installed under
+$prefix, then the list will be empty.  Answer 'none' to tell perl
+to not search earlier versions.
 
+The default should almost always be sensible, so if you're not sure,
+just accept the default.
 EOM
 
-rp='Colon-separated list of additional directories for perl to search?'
+rp='List of earlier versions to include in @INC?'
 . ./myread
 case "$ans" in
-' '|''|none)	otherlibdirs=' ' ;;     
-*)	otherlibdirs="$ans" ;;
+[Nn]one|''|' '|$undef) inc_version_list=' ' ;;
+*) inc_version_list="$ans" ;;
 esac
-case "$otherlibdirs" in
-' ') val=$undef ;;
-*)	val=$define ;;
+case "$inc_version_list" in
+''|' ') 
+	inc_version_list_init='0';;
+*)	inc_version_list_init=`echo $inc_version_list |
+		$sed -e 's/^/"/' -e 's/ /","/g' -e 's/$/",0/'`
+	;;
 esac
-set d_perl_otherlibdirs
+$rm -f getverlist
+
+: determine whether to install perl also as /usr/bin/perl
+
+echo " "
+if $test -d /usr/bin -a "X$installbin" != X/usr/bin; then
+	$cat <<EOM
+Many scripts expect perl to be installed as /usr/bin/perl.
+
+If you want to, I can install the perl you are about to compile
+as /usr/bin/perl (in addition to $bin/perl).
+EOM
+	if test -f /usr/bin/perl; then
+	    $cat <<EOM
+
+However, please note that because you already have a /usr/bin/perl,
+overwriting that with a new Perl would very probably cause problems.
+Therefore I'm assuming you don't want to do that (unless you insist).
+
+EOM
+	    case "$installusrbinperl" in
+	    "$define"|[yY]*)	dflt='y';;
+	    *)			dflt='n';;
+	    esac
+	else
+	    $cat <<EOM
+
+Since you don't have a /usr/bin/perl I'm assuming creating one is okay.
+
+EOM
+	    case "$installusrbinperl" in
+	    "$undef"|[nN]*)	dflt='n';;
+	    *)			dflt='y';;
+	    esac
+	fi
+	rp="Do you want to install perl as /usr/bin/perl?"
+	. ./myread
+	case "$ans" in
+	[yY]*)	val="$define";;
+	*)	val="$undef" ;;
+	esac
+else
+	val="$undef"
+fi
+set installusrbinperl
 eval $setvar
 
-: Cruising for prototypes
 echo " "
-echo "Checking out function prototypes..." >&4
-$cat >prototype.c <<'EOCP'
-int main(int argc, char *argv[]) {
-	exit(0);}
+echo "Checking for GNU C Library..." >&4
+cat >try.c <<'EOCP'
+/* Find out version of GNU C library.  __GLIBC__ and __GLIBC_MINOR__
+   alone are insufficient to distinguish different versions, such as
+   2.0.6 and 2.0.7.  The function gnu_get_libc_version() appeared in
+   libc version 2.1.0.      A. Dougherty,  June 3, 2002.
+*/
+#include <stdio.h>
+int main(void)
+{
+#ifdef __GLIBC__
+#   ifdef __GLIBC_MINOR__
+#       if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+#           include <gnu/libc-version.h>
+	    printf("%s\n",  gnu_get_libc_version());
+#       else
+	    printf("%d.%d\n",  __GLIBC__, __GLIBC_MINOR__);
+#       endif
+#   else
+	printf("%d\n",  __GLIBC__);
+#   endif
+    return 0;
+#else
+    return 1;
+#endif
+}
 EOCP
-if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then
-	echo "Your C compiler appears to support function prototypes."
+set try
+if eval $compile_ok && $run ./try > glibc.ver; then
 	val="$define"
+	gnulibc_version=`$cat glibc.ver`
+	echo "You are using the GNU C Library version $gnulibc_version"
 else
-	echo "Your C compiler doesn't seem to understand function prototypes."
 	val="$undef"
+	gnulibc_version=''
+	echo "You are not using the GNU C Library"
 fi
-set prototype
+$rm -f try try.* glibc.ver
+set d_gnulibc
 eval $setvar
-$rm -f prototype*
-
-case "$prototype" in
-"$define") ;;
-*)	ansi2knr='ansi2knr'
-	echo " "
-	cat <<EOM >&4
 
-$me:  FATAL ERROR:
-This version of $package can only be compiled by a compiler that 
-understands function prototypes.  Unfortunately, your C compiler 
-	$cc $ccflags
-doesn't seem to understand them.  Sorry about that.
+: see if nm is to be used to determine whether a symbol is defined or not
+case "$usenm" in
+'')
+	dflt=''
+	case "$d_gnulibc" in
+	"$define")
+		echo " "
+		echo "nm probably won't work on the GNU C Library." >&4
+		dflt=n
+		;;
+	esac
+	case "$dflt" in
+	'') 
+		if $test "$osname" = aix -a "X$PASE" != "Xdefine" -a ! -f /lib/syscalls.exp; then
+			echo " "
+			echo "Whoops!  This is an AIX system without /lib/syscalls.exp!" >&4
+			echo "'nm' won't be sufficient on this sytem." >&4
+			dflt=n
+		fi
+		;;
+	esac
+	case "$dflt" in
+	'') dflt=`$egrep 'inlibc|csym' $rsrc/Configure | wc -l 2>/dev/null`
+		if $test $dflt -gt 20; then
+			dflt=y
+		else
+			dflt=n
+		fi
+		;;
+	esac
+	;;
+*)
+	case "$usenm" in
+	true|$define) dflt=y;;
+	*) dflt=n;;
+	esac
+	;;
+esac
+$cat <<EOM
 
-If GNU cc is available for your system, perhaps you could try that instead.  
+I can use $nm to extract the symbols from your C libraries. This
+is a time consuming task which may generate huge output on the disk (up
+to 3 megabytes) but that should make the symbols extraction faster. The
+alternative is to skip the 'nm' extraction part and to compile a small
+test program instead to determine whether each symbol is present. If
+you have a fast C compiler and/or if your 'nm' output cannot be parsed,
+this may be the best solution.
 
-Eventually, we hope to support building Perl with pre-ANSI compilers.
-If you would like to help in that effort, please contact <perlbug@perl.org>.
+You probably shouldn't let me use 'nm' if you are using the GNU C Library.
 
-Aborting Configure now.
 EOM
-	exit 2
+rp="Shall I use $nm to extract C symbols from the libraries?"
+. ./myread
+case "$ans" in
+[Nn]*) usenm=false;;
+*) usenm=true;;
+esac
+
+runnm=$usenm
+case "$reuseval" in
+true) runnm=false;;
+esac
+
+: nm options which may be necessary
+case "$nm_opt" in
+'') if $test -f /mach_boot; then
+		nm_opt=''	# Mach
+	elif $test -d /usr/ccs/lib; then
+		nm_opt='-p'	# Solaris (and SunOS?)
+	elif $test -f /dgux; then
+		nm_opt='-p'	# DG-UX
+	elif $test -f /lib64/rld; then
+		nm_opt='-p'	# 64-bit Irix
+	else
+		nm_opt=''
+	fi;;
+esac
+
+: nm options which may be necessary for shared libraries but illegal
+: for archive libraries.  Thank you, Linux.
+case "$nm_so_opt" in
+'')	case "$myuname" in
+	*linux*|gnu*)
+		if $nm --help | $grep 'dynamic' > /dev/null 2>&1; then
+			nm_so_opt='--dynamic'
+		fi
+		;;
+	esac
+	;;
+esac
+
+case "$runnm" in
+true)
+: get list of predefined functions in a handy place
+echo " "
+case "$libc" in
+'') libc=unknown
+	case "$libs" in
+	*-lc_s*) libc=`./loc libc_s$_a $libc $libpth`
+	esac
+	;;
+esac
+case "$libs" in
+'') ;;
+*)  for thislib in $libs; do
+	case "$thislib" in
+	-lc|-lc_s)
+		: Handle C library specially below.
+		;;
+	-l*)
+		thislib=`echo $thislib | $sed -e 's/^-l//'`
+		if try=`./loc lib$thislib.$so.'*' X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc lib$thislib$_a X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc $thislib$_a X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc lib$thislib X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
+			:
+		elif try=`./loc Slib$thislib$_a X $xlibpth`; $test -f "$try"; then
+			:
+		else
+			try=''
+		fi
+		libnames="$libnames $try"
+		;;
+	*) libnames="$libnames $thislib" ;;
+	esac
+	done
+	;;
+esac
+xxx=normal
+case "$libc" in
+unknown)
+	set /lib/libc.$so
+	for xxx in $libpth; do
+		$test -r $1 || set $xxx/libc.$so
+		: The messy sed command sorts on library version numbers.
+		$test -r $1 || \
+			set `echo blurfl; echo $xxx/libc.$so.[0-9]* | \
+			tr ' ' $trnl | egrep -v '\.[A-Za-z]*$' | $sed -e '
+				h
+				s/[0-9][0-9]*/0000&/g
+				s/0*\([0-9][0-9][0-9][0-9][0-9]\)/\1/g
+				G
+				s/\n/ /' | \
+			 $sort | $sed -e 's/^.* //'`
+		eval set \$$#
+	done
+	$test -r $1 || set /usr/ccs/lib/libc.$so
+	$test -r $1 || set /lib/libsys_s$_a
+	;;
+*)
+	set blurfl
 	;;
 esac
-
-: determine where public executables go
-echo " "
-set dflt bin bin
-eval $prefixit
-fn=d~
-rp='Pathname where the public executables will reside?'
-. ./getfile
-if $test "X$ansexp" != "X$binexp"; then
-	installbin=''
-fi
-bin="$ans"
-binexp="$ansexp"
-: Change installation prefix, if necessary.
-: XXX Bug? -- ignores Configure -Dinstallprefix setting.
-if $test X"$prefix" != X"$installprefix"; then
-	installbin=`echo $binexp | sed "s#^$prefix#$installprefix#"`
+if $test -r "$1"; then
+	echo "Your (shared) C library seems to be in $1."
+	libc="$1"
+elif $test -r /lib/libc && $test -r /lib/clib; then
+	echo "Your C library seems to be in both /lib/clib and /lib/libc."
+	xxx=apollo
+	libc='/lib/clib /lib/libc'
+	if $test -r /lib/syslib; then
+		echo "(Your math library is in /lib/syslib.)"
+		libc="$libc /lib/syslib"
+	fi
+elif $test -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
+	echo "Your C library seems to be in $libc, as you said before."
+elif $test -r $incpath/usr/lib/libc$_a; then
+	libc=$incpath/usr/lib/libc$_a;
+	echo "Your C library seems to be in $libc.  That's fine."
+elif $test -r /lib/libc$_a; then
+	libc=/lib/libc$_a;
+	echo "Your C library seems to be in $libc.  You're normal."
 else
-	installbin="$binexp"
+	if tans=`./loc libc$_a blurfl/dyick $libpth`; $test -r "$tans"; then
+		:
+	elif tans=`./loc libc blurfl/dyick $libpth`; $test -r "$tans"; then
+		libnames="$libnames "`./loc clib blurfl/dyick $libpth`
+	elif tans=`./loc clib blurfl/dyick $libpth`; $test -r "$tans"; then
+		:
+	elif tans=`./loc Slibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
+		:
+	elif tans=`./loc Mlibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
+		:
+	else
+		tans=`./loc Llibc$_a blurfl/dyick $xlibpth`
+	fi
+	if $test -r "$tans"; then
+		echo "Your C library seems to be in $tans, of all places."
+		libc=$tans
+	else
+		libc='blurfl'
+	fi
 fi
+if $test $xxx = apollo -o -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
+	dflt="$libc"
+	cat <<EOM
 
-echo " "
-case "$extras" in
-'') dflt='n';;
-*) dflt='y';;
-esac
-cat <<EOM
-Perl can be built with extra modules or bundles of modules which
-will be fetched from the CPAN and installed alongside Perl.
-
-Notice that you will need access to the CPAN; either via the Internet,
-or a local copy, for example a CD-ROM or a local CPAN mirror.  (You will
-be asked later to configure the CPAN.pm module which will in turn do
-the installation of the rest of the extra modules or bundles.)
+If the guess above is wrong (which it might be if you're using a strange
+compiler, or your machine supports multiple models), you can override it here.
 
-Notice also that if the modules require any external software such as
-libraries and headers (the libz library and the zlib.h header for the
-Compress::Zlib module, for example) you MUST have any such software
-already installed, this configuration process will NOT install such
-things for you.
+EOM
+else
+	dflt=''
+	echo $libpth | $tr ' ' $trnl | $sort | $uniq > libpath
+	cat >&4 <<EOM
+I can't seem to find your C library.  I've looked in the following places:
 
-If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-rp='Install any extra modules (y or n)?'
-. ./myread
-case "$ans" in
-y|Y)
+	$sed 's/^/	/' libpath
 	cat <<EOM
 
-Please list any extra modules or bundles to be installed from CPAN,
-with spaces between the names.  The names can be in any format the
-'install' command of CPAN.pm will understand.  (Answer 'none',
-without the quotes, to install no extra modules or bundles.)
+None of these seems to contain your C library. I need to get its name...
+
 EOM
-	rp='Extras?'
-	dflt="$extras"
-	. ./myread
-	extras="$ans"
-esac
-case "$extras" in
-''|'none')
-	val=''
-	$rm -f ../extras.lst
-	;;
-*)	echo "(Saving the list of extras for later...)"
-	echo "$extras" > ../extras.lst
-	val="'$extras'"
-	;;
-esac
-set extras
-eval $setvar
+fi
+fn=f
+rp='Where is your C library?'
+. ./getfile
+libc="$ans"
+
+echo " "
+echo $libc $libnames | $tr ' ' $trnl | $sort | $uniq > libnames
+set X `cat libnames`
+shift
+xxx=files
+case $# in 1) xxx=file; esac
+echo "Extracting names from the following $xxx for later perusal:" >&4
+echo " "
+$sed 's/^/	/' libnames >&4
 echo " "
+$echo $n "This may take a while...$c" >&4
 
-: Find perl5.005 or later.
-echo "Looking for a previously installed perl5.005 or later... "
-case "$perl5" in
-'')	for tdir in `echo "$binexp$path_sep$PATH" | $sed "s/$path_sep/ /g"`; do
-		: Check if this perl is recent and can load a simple module
-		if $test -x $tdir/perl$exe_ext && $tdir/perl -Mless -e 'use 5.005;' >/dev/null 2>&1; then
-			perl5=$tdir/perl
-			break;
-		elif $test -x $tdir/perl5$exe_ext && $tdir/perl5 -Mless -e 'use 5.005;' >/dev/null 2>&1; then
-			perl5=$tdir/perl5
-			break;
+for file in $*; do
+	case $file in
+	*$so*) $nm $nm_so_opt $nm_opt $file 2>/dev/null;;
+	*) $nm $nm_opt $file 2>/dev/null;;
+	esac
+done >libc.tmp
+
+$echo $n ".$c"
+$grep fprintf libc.tmp > libc.ptf
+xscan='eval "<libc.ptf $com >libc.list"; $echo $n ".$c" >&4'
+xrun='eval "<libc.tmp $com >libc.list"; echo "done." >&4'
+xxx='[ADTSIW]'
+if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx  *//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^__*//' -e 's/^\([a-zA-Z_0-9$]*\).*xtern.*/\1/p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e '/|UNDEF/d' -e '/FUNC..GL/s/^.*|__*//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^.* D __*//p' -e 's/^.* D //p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^_//' -e 's/^\([a-zA-Z_0-9]*\).*xtern.*text.*/\1/p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^.*|FUNC |GLOB .*|//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$grep '|' | $sed -n -e '/|COMMON/d' -e '/|DATA/d' \
+				-e '/ file/d' -e 's/^\([^ 	]*\).*/\1/p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^.*|FUNC |GLOB .*|//p' -e 's/^.*|FUNC |WEAK .*|//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^__//' -e '/|Undef/d' -e '/|Proc/s/ .*//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^.*|Proc .*|Text *| *//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e '/Def. Text/s/.* \([^ ]*\)\$/\1/p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="$sed -n -e 's/.*\.text n\ \ \ \.//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+elif com="sed -n -e 's/^__.*//' -e 's/[       ]*D[    ]*[0-9]*.*//p'";\
+	eval $xscan;\
+	$contains '^fprintf$' libc.list >/dev/null 2>&1; then
+		eval $xrun
+else
+	$nm -p $* 2>/dev/null >libc.tmp
+	$grep fprintf libc.tmp > libc.ptf
+	if com="$sed -n -e 's/^.* [ADTSIW]  *_[_.]*//p' -e 's/^.* [ADTSIW] //p'";\
+		eval $xscan; $contains '^fprintf$' libc.list >/dev/null 2>&1
+	then
+		nm_opt='-p'
+		eval $xrun
+	else
+		echo " "
+		echo "$nm didn't seem to work right. Trying $ar instead..." >&4
+		com=''
+		if $ar t $libc > libc.tmp && $contains '^fprintf$' libc.tmp >/dev/null 2>&1; then
+			for thisname in $libnames $libc; do
+				$ar t $thisname >>libc.tmp
+			done
+			$sed -e "s/\\$_o\$//" < libc.tmp > libc.list
+			echo "Ok." >&4
+		elif test "X$osname" = "Xos2" && $ar tv $libc > libc.tmp; then
+			# Repeat libc to extract forwarders to DLL entries too
+			for thisname in $libnames $libc; do
+				$ar tv $thisname >>libc.tmp
+				# Revision 50 of EMX has bug in $ar.
+				# it will not extract forwarders to DLL entries
+				# Use emximp which will extract exactly them.
+				emximp -o tmp.imp $thisname \
+				    2>/dev/null && \
+				    $sed -e 's/^\([_a-zA-Z0-9]*\) .*$/\1/p' \
+				    < tmp.imp >>libc.tmp
+				$rm tmp.imp
+			done
+			$sed -e "s/\\$_o\$//" -e 's/^ \+//' < libc.tmp > libc.list
+			echo "Ok." >&4
+		else
+			echo "$ar didn't seem to work right." >&4
+			echo "Maybe this is a Cray...trying bld instead..." >&4
+			if bld t $libc | $sed -e 's/.*\///' -e "s/\\$_o:.*\$//" > libc.list
+			then
+				for thisname in $libnames; do
+					bld t $libnames | \
+					$sed -e 's/.*\///' -e "s/\\$_o:.*\$//" >>libc.list
+					$ar t $thisname >>libc.tmp
+				done
+				echo "Ok." >&4
+			else
+				echo "That didn't work either.  Giving up." >&4
+				exit 1
+			fi
 		fi
-	done
-	;;
-*)	perl5="$perl5"
-	;;
+	fi
+fi
+nm_extract="$com"
+case "$PASE" in
+define)
+    echo " "
+    echo "Since you are compiling for PASE, extracting more symbols from libc.a ...">&4
+    dump -Tv /lib/libc.a | awk '$7 == "/unix" {print $5 " " $8}' | grep "^SV" | awk '{print $2}' >> libc.list
+    ;;
+*)  if $test -f /lib/syscalls.exp; then
+	echo " "
+	echo "Also extracting names from /lib/syscalls.exp for good ole AIX..." >&4
+	$sed -n 's/^\([^ 	]*\)[ 	]*syscall[0-9]*[ 	]*$/\1/p' /lib/syscalls.exp >>libc.list
+    fi
+    ;;
 esac
-case "$perl5" in
-'')	echo "None found.  That's ok.";;
-*)	echo "Using $perl5." ;;
+;;
 esac
+$rm -f libnames libpath
 
-: Determine list of previous versions to include in @INC
-$cat > getverlist <<EOPL
-#!$perl5 -w
-use File::Basename;
-\$api_versionstring = "$api_versionstring";
-\$version = "$version";
-\$stem = "$sitelib_stem";
-\$archname = "$archname";
-EOPL
-	$cat >> getverlist <<'EOPL'
-# Can't have leading @ because metaconfig interprets it as a command!
-;@inc_version_list=();
-# XXX Redo to do opendir/readdir? 
-if (-d $stem) {
-    chdir($stem);
-    ;@candidates = glob("5.*");
-}
-else {
-    ;@candidates = ();
-}
-
-# XXX ToDo:  These comparisons must be reworked when two-digit
-# subversions come along, so that 5.7.10 compares as greater than
-# 5.7.3!  By that time, hope that 5.6.x is sufficiently
-# widespread that we can use the built-in version vectors rather
-# than reinventing them here.  For 5.6.0, however, we must
-# assume this script will likely be run by 5.005_0x.  --AD 1/2000.
-foreach $d (@candidates) {
-    if ($d lt $version) {
-	if ($d ge $api_versionstring) {
-	    unshift(@inc_version_list, grep { -d } "$d/$archname", $d);
-	}
-	elsif ($d ge "5.005") {
-	    unshift(@inc_version_list, grep { -d } $d);
-	}
-    }
-    else {
-	# Skip newer version.  I.e. don't look in
-	# 5.7.0 if we're installing 5.6.1.
-    }
-}
+: see if dld is available
+set dld.h i_dld
+eval $inhdr
 
-if (@inc_version_list) {
-    print join(' ', @inc_version_list);
-}
-else {
-    # Blank space to preserve value for next Configure run.
-    print " ";
-}
-EOPL
-chmod +x getverlist
-case "$inc_version_list" in
-'')	if test -x "$perl5$exe_ext"; then
-		dflt=`$perl5 getverlist`
+: is a C symbol defined?
+csym='tlook=$1;
+case "$3" in
+-v) tf=libc.tmp; tdc="";;
+-a) tf=libc.tmp; tdc="[]";;
+*) tlook="^$1\$"; tf=libc.list; tdc="()";;
+esac;
+tx=yes;
+case "$reuseval-$4" in
+true-) ;;
+true-*) tx=no; eval "tval=\$$4"; case "$tval" in "") tx=yes;; esac;;
+esac;
+case "$tx" in
+yes)
+	tval=false;
+	if $test "$runnm" = true; then
+		if $contains $tlook $tf >/dev/null 2>&1; then
+			tval=true;
+		elif $test "$mistrustnm" = compile -o "$mistrustnm" = run; then
+			echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
+			$cc -o try $optimize $ccflags $ldflags try.c >/dev/null 2>&1 $libs && tval=true;
+			$test "$mistrustnm" = run -a -x try && { $run ./try$_exe >/dev/null 2>&1 || tval=false; };
+			$rm -f try$_exe try.c core core.* try.core;
+		fi;
 	else
-		dflt='none'
-	fi
+		echo "void *(*(p()))$tdc { extern void *$1$tdc; return &$1; } int main() { if(p()) return(0); else return(1); }"> try.c;
+		$cc -o try $optimize $ccflags $ldflags try.c $libs >/dev/null 2>&1 && tval=true;
+		$rm -f try$_exe try.c;
+	fi;
 	;;
-$undef) dflt='none' ;;
-*)  eval dflt=\"$inc_version_list\" ;;
-esac
-case "$dflt" in
-''|' ') dflt=none ;;
-esac
-case "$dflt" in
-5.005) case "$bincompat5005" in
-       $define|true|[yY]*) ;;
-       *) dflt=none ;;
-       esac
-       ;;
-esac
-$cat <<'EOM'
-
-In order to ease the process of upgrading, this version of perl 
-can be configured to use modules built and installed with earlier 
-versions of perl that were installed under $prefix.  Specify here
-the list of earlier versions that this version of perl should check.
-If Configure detected no earlier versions of perl installed under
-$prefix, then the list will be empty.  Answer 'none' to tell perl
-to not search earlier versions.
-
-The default should almost always be sensible, so if you're not sure,
-just accept the default.
-EOM
-
-rp='List of earlier versions to include in @INC?'
-. ./myread
-case "$ans" in
-[Nn]one|''|' ') inc_version_list=' ' ;;
-*) inc_version_list="$ans" ;;
-esac
-case "$inc_version_list" in
-''|' ') 
-	inc_version_list_init='0';;
-*)	inc_version_list_init=`echo $inc_version_list |
-		$sed -e 's/^/"/' -e 's/ /","/g' -e 's/$/",0/'`
+*)
+	case "$tval" in
+	$define) tval=true;;
+	*) tval=false;;
+	esac;
 	;;
-esac
-$rm -f getverlist
-
-: determine whether to install perl also as /usr/bin/perl
-
-echo " "
-if $test -d /usr/bin -a "X$installbin" != X/usr/bin; then
-	$cat <<EOM
-Many scripts expect perl to be installed as /usr/bin/perl.
-I can install the perl you are about to compile also as /usr/bin/perl
-(in addition to $installbin/perl).
-EOM
-	case "$installusrbinperl" in
-	"$undef"|[nN]*)	dflt='n';;
-	*)		dflt='y';;
-	esac
-	rp="Do you want to install perl as /usr/bin/perl?"
-	. ./myread
-	case "$ans" in
-	[yY]*)	val="$define";;
-	*)	val="$undef" ;;
-	esac
-else
-	val="$undef"
-fi
-set installusrbinperl
-eval $setvar
+esac;
+eval "$2=$tval"'
 
-: see if dld is available
-set dld.h i_dld
-eval $inhdr
+: define an is-in-libc? function
+inlibc='echo " "; td=$define; tu=$undef;
+sym=$1; var=$2; eval "was=\$$2";
+tx=yes;
+case "$reuseval$was" in
+true) ;;
+true*) tx=no;;
+esac;
+case "$tx" in
+yes)
+	set $sym tres -f;
+	eval $csym;
+	case "$tres" in
+	true)
+		echo "$sym() found." >&4;
+		case "$was" in $undef) . ./whoa; esac; eval "$var=\$td";;
+	*)
+		echo "$sym() NOT found." >&4;
+		case "$was" in $define) . ./whoa; esac; eval "$var=\$tu";;
+	esac;;
+*)
+	case "$was" in
+	$define) echo "$sym() found." >&4;;
+	*) echo "$sym() NOT found." >&4;;
+	esac;;
+esac'
 
 : see if dlopen exists
 xxx_runnm="$runnm"
@@ -7361,10 +7606,13 @@ while other systems (such as those using ELF) use $cc.
 
 EOM
 	case "$ld" in
-	'')	$cat >try.c <<'EOM'
+	'')	$cat >try.c <<EOM
 /* Test for whether ELF binaries are produced */
 #include <fcntl.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
 #include <stdlib.h>
+#endif
 int main() {
 	char b[4];
 	int i = open("a.out",O_RDONLY);
@@ -7412,7 +7660,7 @@ EOM
 			      '') dflt="$dflt +vnocompatwarnings" ;;
 			      esac
 			      ;;	
-			linux|irix*)	dflt='-shared' ;;
+			linux|irix*|gnu*)	dflt='-shared' ;;
 			next)  dflt='none' ;;
 			solaris) dflt='-G' ;;
 			sunos) dflt='-assert nodefinitions' ;;
@@ -7459,11 +7707,9 @@ say "none".
 EOM
     case "$ccdlflags" in
     '') case "$osname" in
-		hpux)	dflt='-Wl,-E' ;;
-		linux)	dflt='-rdynamic' ;;
-		next)	dflt='none' ;;
-		sunos)	dflt='none' ;;
-		*)	dflt='none' ;;
+	    linux|hpux|gnu*)	dflt='-Wl,-E' ;;
+	    next|sunos)	dflt='none' ;;
+	    *)		dflt='none' ;;
 	    esac ;;
     ' ')  dflt='none' ;;
     *)  dflt="$ccdlflags" ;;
@@ -7522,7 +7768,7 @@ any other libraries needed on this system (such as -lm, etc.).  Since
 your system supports dynamic loading, it is probably possible to build
 a shared libperl.$so.  If you will have more than one executable linked
 to libperl.$so, this will significantly reduce the size of each
-executable, but it may have a noticeable affect on performance.  The
+executable, but it may have a noticeable effect on performance.  The
 default is probably sensible for your system.
 $also
 
@@ -7558,7 +7804,7 @@ true)
 			dflt=libperl.5.$so
 			# XXX How handle the --version stuff for MAB?
 			;;
-		linux*)  # ld won't link with a bare -lperl otherwise.
+		linux*|gnu*)  # ld won't link with a bare -lperl otherwise.
 			dflt=libperl.$so
 			;;
 		cygwin*) # ld links against an importlib
@@ -7642,10 +7888,10 @@ if "$useshrplib"; then
 	solaris)
 		xxx="-R $shrpdir"
 		;;
-	freebsd|netbsd)
+	freebsd|netbsd|openbsd|interix)
 		xxx="-Wl,-R$shrpdir"
 		;;
-	bsdos|linux|irix*|dec_osf)
+	bsdos|linux|irix*|dec_osf|gnu*)
 		xxx="-Wl,-rpath,$shrpdir"
 		;;
 	next)
@@ -8253,6 +8499,12 @@ esac
 set versiononly
 eval $setvar
 
+case "$versiononly" in
+"$define") inc_version_list=''
+           inc_version_list_init=0
+           ;;
+esac
+
 : figure out how to guarantee perl startup
 case "$startperl" in
 '')
@@ -8354,35 +8606,167 @@ EOM
 fn=d~
 rp='Where do you keep publicly executable scripts?'
 . ./getfile
-if $test "X$ansexp" != "X$scriptdirexp"; then
-	installscript=''
+if $test "X$ansexp" != "X$scriptdirexp"; then
+	installscript=''
+fi
+scriptdir="$ans"
+scriptdirexp="$ansexp"
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installscript=`echo $scriptdirexp | sed "s#^$prefix#$installprefix#"`
+else
+	installscript="$scriptdirexp"
+fi
+
+: determine where add-on public executables go
+case "$sitebin" in
+'')	dflt=$siteprefix/bin ;;
+*)	dflt=$sitebin ;;
+esac
+fn=d~
+rp='Pathname where the add-on public executables should be installed?'
+. ./getfile
+sitebin="$ans"
+sitebinexp="$ansexp"
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installsitebin=`echo $sitebinexp | sed "s#^$prefix#$installprefix#"`
+else
+	installsitebin="$sitebinexp"
+fi
+
+: determine where add-on html pages go
+: There is no standard location, so try to copy the previously-selected
+: directory structure for the core html pages.
+case "$sitehtml1dir" in
+'')    dflt=`echo "$html1dir" | $sed "s#^$prefix#$siteprefix#"` ;;
+*)     dflt=$sitehtml1dir ;;
+esac
+case "$dflt" in
+''|' ') dflt=none ;;
+esac
+fn=dn+~
+rp='Pathname where the site-specific html pages should be installed?'
+. ./getfile
+sitehtml1dir="$ans"
+sitehtml1direxp="$ansexp"
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installsitehtml1dir=`echo $sitehtml1direxp | $sed "s#^$prefix#$installprefix#"`
+else
+	installsitehtml1dir="$sitehtml1direxp"
+fi
+
+: determine where add-on library html pages go
+: There is no standard location, so try to copy the previously-selected
+: directory structure for the core html pages.
+case "$sitehtml3dir" in
+'')    dflt=`echo "$html3dir" | $sed "s#^$prefix#$siteprefix#"` ;;
+*)     dflt=$sitehtml3dir ;;
+esac
+case "$dflt" in
+''|' ') dflt=none ;;
+esac
+fn=dn+~
+rp='Pathname where the site-specific library html pages should be installed?'
+. ./getfile
+sitehtml3dir="$ans"
+sitehtml3direxp="$ansexp"
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installsitehtml3dir=`echo $sitehtml3direxp | $sed "s#^$prefix#$installprefix#"`
+else
+	installsitehtml3dir="$sitehtml3direxp"
+fi
+
+: determine where add-on manual pages go
+case "$siteman1dir" in
+'')	dflt=`echo $man1dir | $sed "s#^$prefix#$siteprefix#"` ;;
+*)  	dflt=$siteman1dir ;;
+esac
+case "$dflt" in
+''|' ') dflt=none ;;
+esac
+fn=dn+~
+rp='Pathname where the site-specific manual pages should be installed?'
+. ./getfile
+siteman1dir="$ans"
+siteman1direxp="$ansexp"
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installsiteman1dir=`echo $siteman1direxp | $sed "s#^$prefix#$installprefix#"`
+else
+	installsiteman1dir="$siteman1direxp"
 fi
-scriptdir="$ans"
-scriptdirexp="$ansexp"
+
+: determine where add-on library man pages go
+case "$siteman3dir" in
+'')	dflt=`echo $man3dir | $sed "s#^$prefix#$siteprefix#"` ;;
+*)  	dflt=$siteman3dir ;;
+esac
+case "$dflt" in
+''|' ') dflt=none ;;
+esac
+fn=dn+~
+rp='Pathname where the site-specific library manual pages should be installed?'
+. ./getfile
+siteman3dir="$ans"
+siteman3direxp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installscript=`echo $scriptdirexp | sed "s#^$prefix#$installprefix#"`
+	installsiteman3dir=`echo $siteman3direxp | $sed "s#^$prefix#$installprefix#"`
 else
-	installscript="$scriptdirexp"
+	installsiteman3dir="$siteman3direxp"
 fi
 
-: determine where add-on public executables go
-case "$sitebin" in
-'')	dflt=$siteprefix/bin ;;
-*)	dflt=$sitebin ;;
+: determine where add-on public executable scripts go
+case "$sitescript" in
+'')	dflt=$siteprefix/script
+	$test -d $dflt || dflt=$sitebin ;;
+*)  dflt="$sitescript" ;;
 esac
-fn=d~
-rp='Pathname where the add-on public executables should be installed?'
+fn=d~+
+rp='Pathname where add-on public executable scripts should be installed?'
 . ./getfile
-sitebin="$ans"
-sitebinexp="$ansexp"
+sitescript="$ans"
+sitescriptexp="$ansexp"
 : Change installation prefix, if necessary.
 if $test X"$prefix" != X"$installprefix"; then
-	installsitebin=`echo $sitebinexp | sed "s#^$prefix#$installprefix#"`
+	installsitescript=`echo $sitescriptexp | sed "s#^$prefix#$installprefix#"`
 else
-	installsitebin="$sitebinexp"
+	installsitescript="$sitescriptexp"
 fi
 
+case "$usefaststdio" in
+$define|true|[yY]*|'')
+	xversion=`awk '/define[ 	]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
+	case "$xversion" in
+	[68])	dflt='y' ;;
+	*)	dflt='n' ;;
+	esac
+	;;
+*) dflt='n';;
+esac
+cat <<EOM
+
+Perl can be built to use 'fast stdio', which means using the stdio
+library but also directly manipulating the stdio buffers to enable
+faster I/O.  Using stdio is better for backward compatibility (especially
+for Perl extensions), but on the other hand since Perl 5.8 the 'perlio'
+interface has been preferred instead of stdio.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
+rp='Use the "fast stdio" if available?'
+. ./myread
+case "$ans" in
+y|Y)	val="$define" ;;     
+*)      val="$undef" ;;
+esac
+set usefaststdio
+eval $setvar
+
+
 : define an is-a-typedef? function
 typedef='type=$1; var=$2; def=$3; shift; shift; shift; inclist=$@;
 case "$inclist" in
@@ -8483,6 +8867,10 @@ echo "Checking the size of $zzz..." >&4
 cat > try.c <<EOCP
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
     printf("%d\n", (int)sizeof($fpostype));
     exit(0);
@@ -8508,8 +8896,6 @@ else
 	fpossize="$ans"
 fi
 
-
-
 # Backward compatibility (uselfs is deprecated).
 case "$uselfs" in
 "$define"|true|[yY]*)
@@ -8548,14 +8934,16 @@ EOM
 esac
 set uselargefiles
 eval $setvar
-case "$uselargefiles" in
-"$define")
 : Look for a hint-file generated 'call-back-unit'.  If the
 : user has specified that a large files perl is to be built,
 : we may need to set or change some other defaults.
+if $test -f uselargefiles.cbu; then
+	echo "Your platform has some specific hints regarding large file builds, using them..."
+	. ./uselargefiles.cbu
+fi
+case "$uselargefiles" in
+"$define")
 	if $test -f uselargefiles.cbu; then
-		echo "Your platform has some specific hints for large file builds, using them..."
-		. ./uselargefiles.cbu
 		echo " "
 		echo "Rechecking to see how big your file offsets are..." >&4
 		$cat >try.c <<EOCP
@@ -8587,9 +8975,13 @@ EOCP
 		$cat > try.c <<EOCP
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
     printf("%d\n", (int)sizeof($fpostype));
-    exit(0);
+    return(0);
 }
 EOCP
 		set try
@@ -8617,6 +9009,11 @@ EOCP
 	;;
 esac
 
+# probably will refer to
+#   $archlib $privlib $sitearch $sitelib $vendorarch $vendorlib
+need_relocation=0
+userelocatableinc=undef
+
 case "$vendorprefix" in
 '')	d_vendorbin="$undef"
 	vendorbin=''
@@ -8635,18 +9032,286 @@ case "$vendorprefix" in
 	vendorbinexp="$ansexp"
 	;;
 esac
-: Change installation prefix, if necessary.
-if $test X"$prefix" != X"$installprefix"; then
-	installvendorbin=`echo $vendorbinexp | $sed "s#^$prefix#$installprefix#"`
-else
-	installvendorbin="$vendorbinexp"
-fi
-
-: see if qgcvt exists
-set qgcvt d_qgcvt
-eval $inlibc
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorbin=`echo $vendorbinexp | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorbin="$vendorbinexp"
+fi
+
+case "$vendorprefix" in
+'')	vendorhtml1dir=''
+	vendorhtml1direxp=''
+	;;
+*)	: determine where vendor-supplied html pages go.
+	: There is no standard location, so try to copy the previously-selected
+	: directory structure for the core html pages.
+	: XXX Better default suggestions would be welcome.
+	case "$vendorhtml1dir" in
+	'')	dflt=`echo "$html1dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
+	*)	dflt=$vendorhtml1dir ;;
+	esac
+	case "$dflt" in
+	''|' ') dflt=none ;;
+	esac
+	fn=dn+~
+	rp='Pathname for the vendor-supplied html pages?'
+	. ./getfile
+	vendorhtml1dir="$ans"
+	vendorhtml1direxp="$ansexp"
+	;;
+esac
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$vendorhtml1dir" = "X" && vendorhtml1dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorhtml1dir=`echo $vendorhtml1direxp | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorhtml1dir="$vendorhtml1direxp"
+fi
+
+case "$vendorprefix" in
+'')	vendorhtml3dir=''
+	vendorhtml3direxp=''
+	;;
+*)	: determine where vendor-supplied module html pages go.
+	: There is no standard location, so try to copy the previously-selected
+	: directory structure for the core html pages.
+	: XXX Better default suggestions would be welcome.
+	case "$vendorhtml3dir" in
+	'')	dflt=`echo "$html3dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
+	*)	dflt=$vendorhtml3dir ;;
+	esac
+	case "$dflt" in
+	''|' ') dflt=none ;;
+	esac
+	fn=dn+~
+	rp='Pathname for the vendor-supplied html pages?'
+	. ./getfile
+	vendorhtml3dir="$ans"
+	vendorhtml3direxp="$ansexp"
+	;;
+esac
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$vendorhtml3dir" = "X" && vendorhtml3dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorhtml3dir=`echo $vendorhtml3direxp | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorhtml3dir="$vendorhtml3direxp"
+fi
+
+case "$vendorprefix" in
+'')	vendorman1dir=''
+	vendorman1direxp=''
+	;;
+*)	: determine where vendor-supplied manual pages go.
+	case "$vendorman1dir" in
+	'') dflt=`echo "$man1dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
+	*)	dflt=$vendorman1dir ;;
+	esac
+	case "$dflt" in
+	''|' ') dflt=none ;;
+	esac
+	fn=nd~+
+	rp='Pathname for the vendor-supplied manual section 1 pages?'
+	. ./getfile
+	vendorman1dir="$ans"
+	vendorman1direxp="$ansexp"
+	;;
+esac
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$vendorman1dir" = "X" && vendorman1dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorman1dir=`echo "$vendorman1direxp" | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorman1dir="$vendorman1direxp"
+fi
+
+case "$vendorprefix" in
+'')	vendorman3dir=''
+	vendorman3direxp=''
+	;;
+*)	: determine where vendor-supplied module manual pages go.
+	case "$vendorman3dir" in
+	'') dflt=`echo "$man3dir" | $sed "s#^$prefix#$vendorprefix#"` ;;
+	*)	dflt=$vendorman3dir ;;
+	esac
+	case "$dflt" in
+	''|' ') dflt=none ;;
+	esac
+	fn=nd~+
+	rp='Pathname for the vendor-supplied manual section 3 pages?'
+	. ./getfile
+	vendorman3dir="$ans"
+	vendorman3direxp="$ansexp"
+	;;
+esac
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$vendorman3dir" = "X" && vendorman3dir=' '
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorman3dir=`echo "$vendorman3direxp" | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorman3dir="$vendorman3direxp"
+fi
+
+case "$vendorprefix" in
+'')	d_vendorscript="$undef"
+	vendorscript=''
+	vendorscriptexp=''
+	;;
+*)	d_vendorscript="$define"
+	: determine where vendor-supplied scripts go.
+	case "$vendorscript" in
+	'')	dflt=$vendorprefix/script
+		$test -d $dflt || dflt=$vendorbin ;;
+	*)  dflt="$vendorscript" ;;
+	esac
+	$cat <<EOM
+
+The installation process will create a directory for 
+vendor-supplied scripts.
+
+EOM
+	fn=d~+
+	rp='Pathname for the vendor-supplied scripts directory?'
+	. ./getfile
+	vendorscript="$ans"
+	vendorscriptexp="$ansexp"
+	;;
+esac
+: Change installation prefix, if necessary.
+if $test X"$prefix" != X"$installprefix"; then
+	installvendorscript=`echo $vendorscriptexp | $sed "s#^$prefix#$installprefix#"`
+else
+	installvendorscript="$vendorscriptexp"
+fi
+
+: see if qgcvt exists
+set qgcvt d_qgcvt
+eval $inlibc
+
+echo " "
+
+if $test X"$d_longdbl" = X"$define"; then
+
+echo "Checking how to print long doubles..." >&4
+
+if $test X"$sPRIfldbl" = X -a X"$doublesize" = X"$longdblsize"; then
+	$cat >try.c <<'EOCP'
+#include <sys/types.h>
+#include <stdio.h>
+int main() {
+  double d = 123.456;
+  printf("%.3f\n", d);
+}
+EOCP
+	set try
+	if eval $compile; then
+		yyy=`$run ./try`
+		case "$yyy" in
+		123.456)
+			sPRIfldbl='"f"'; sPRIgldbl='"g"'; sPRIeldbl='"e"';
+                	sPRIFUldbl='"F"'; sPRIGUldbl='"G"'; sPRIEUldbl='"E"';
+			echo "We will use %f."
+			;;
+		esac
+	fi
+fi
+
+if $test X"$sPRIfldbl" = X; then
+	$cat >try.c <<'EOCP'
+#include <sys/types.h>
+#include <stdio.h>
+int main() {
+  long double d = 123.456;
+  printf("%.3Lf\n", d);
+}
+EOCP
+	set try
+	if eval $compile; then
+		yyy=`$run ./try`
+		case "$yyy" in
+		123.456)
+			sPRIfldbl='"Lf"'; sPRIgldbl='"Lg"'; sPRIeldbl='"Le"';
+                	sPRIFUldbl='"LF"'; sPRIGUldbl='"LG"'; sPRIEUldbl='"LE"';
+			echo "We will use %Lf."
+			;;
+		esac
+	fi
+fi
+
+if $test X"$sPRIfldbl" = X; then
+	$cat >try.c <<'EOCP'
+#include <sys/types.h>
+#include <stdio.h>
+int main() {
+  long double d = 123.456;
+  printf("%.3llf\n", d);
+}
+EOCP
+	set try
+	if eval $compile; then
+		yyy=`$run ./try`
+		case "$yyy" in
+		123.456)
+			sPRIfldbl='"llf"'; sPRIgldbl='"llg"'; sPRIeldbl='"lle"';
+                	sPRIFUldbl='"llF"'; sPRIGUldbl='"llG"'; sPRIEUldbl='"llE"';
+			echo "We will use %llf."
+			;;
+		esac
+	fi
+fi
+
+if $test X"$sPRIfldbl" = X; then
+	$cat >try.c <<'EOCP'
+#include <sys/types.h>
+#include <stdio.h>
+int main() {
+  long double d = 123.456;
+  printf("%.3lf\n", d);
+}
+EOCP
+	set try
+	if eval $compile; then
+		yyy=`$run ./try`
+		case "$yyy" in
+		123.456)
+			sPRIfldbl='"lf"'; sPRIgldbl='"lg"'; sPRIeldbl='"le"';
+                	sPRIFUldbl='"lF"'; sPRIGUldbl='"lG"'; sPRIEUldbl='"lE"';
+			echo "We will use %lf."
+			;;
+		esac
+	fi
+fi
+
+if $test X"$sPRIfldbl" = X; then
+	echo "Cannot figure out how to print long doubles." >&4
+else
+	sSCNfldbl=$sPRIfldbl	# expect consistency
+fi
+
+$rm -f try try.*
+
+fi # d_longdbl
+
+case "$sPRIfldbl" in
+'')	d_PRIfldbl="$undef"; d_PRIgldbl="$undef"; d_PRIeldbl="$undef"; 
+	d_PRIFUldbl="$undef"; d_PRIGUldbl="$undef"; d_PRIEUldbl="$undef"; 
+	d_SCNfldbl="$undef";
+	;;
+*)	d_PRIfldbl="$define"; d_PRIgldbl="$define"; d_PRIeldbl="$define"; 
+	d_PRIFUldbl="$define"; d_PRIGUldbl="$define"; d_PRIEUldbl="$define"; 
+	d_SCNfldbl="$define";
+	;;
+esac
 
 : Check how to convert floats to strings.
+
+if test "X$d_Gconvert" = X; then
+
 echo " "
 echo "Checking for an efficient way to convert floats to strings."
 echo " " > try.c
@@ -8674,9 +9339,13 @@ char *myname = "qgcvt";
 #define DOUBLETYPE long double
 #endif
 #ifdef TRY_sprintf
-#if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) && defined(HAS_PRIgldbl)
+#if defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE)
+#ifdef HAS_PRIgldbl
 #define Gconvert(x,n,t,b) sprintf((b),"%.*"$sPRIgldbl,(n),(x))
 #else
+#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(double)(x))
+#endif
+#else
 #define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
 #endif
 char *myname = "sprintf";
@@ -8719,6 +9388,21 @@ int main()
 	Gconvert((DOUBLETYPE)0.1, 8, 0, buf);
 	checkit("0.1", buf);
 
+	Gconvert((DOUBLETYPE)0.01, 8, 0, buf); 
+	checkit("0.01", buf);
+
+	Gconvert((DOUBLETYPE)0.001, 8, 0, buf); 
+	checkit("0.001", buf);
+
+	Gconvert((DOUBLETYPE)0.0001, 8, 0, buf); 
+	checkit("0.0001", buf);
+
+	Gconvert((DOUBLETYPE)0.00009, 8, 0, buf);
+	if (strlen(buf) > 5)
+	    checkit("9e-005", buf); /* for Microsoft ?? */
+	else
+	    checkit("9e-05", buf);
+
 	Gconvert((DOUBLETYPE)1.0, 8, 0, buf); 
 	checkit("1", buf);
 
@@ -8757,31 +9441,65 @@ int main()
 	Gconvert((DOUBLETYPE)123.456, 8, 0, buf); 
 	checkit("123.456", buf);
 
-        /* Testing of 1e+129 in bigintpm.t must not get extra '.' here. */
-        Gconvert((DOUBLETYPE)1e30, 8, 0, buf);
-        if (strlen(buf) > 5)
-            checkit("1e+030", buf); /* for Microsoft */
-        else
-            checkit("1e+30", buf);
+	/* Testing of 1e+129 in bigintpm.t must not get extra '.' here. */
+	Gconvert((DOUBLETYPE)1e34, 8, 0, buf);
+	/* 34 should be enough to scare even long double
+	 * places into using the e notation. */
+	if (strlen(buf) > 5)
+	    checkit("1e+034", buf); /* for Microsoft */
+	else
+	    checkit("1e+34", buf);
+
+	/* For Perl, if you add additional tests here, also add them to
+	 * t/base/num.t for benefit of platforms not using Configure or
+	 * overriding d_Gconvert */
 
 	exit(0);
 }
 EOP
-case "$d_Gconvert" in
-gconvert*) xxx_list='gconvert gcvt sprintf' ;;
-gcvt*) xxx_list='gcvt gconvert sprintf' ;;
-sprintf*) xxx_list='sprintf gconvert gcvt' ;;
-*) xxx_list='gconvert gcvt sprintf' ;;
-esac
-
-case "$d_longdbl$uselongdouble$d_PRIgldbl" in
-"$define$define$define")
-    # for long doubles prefer first qgcvt, then sprintf
-    xxx_list="`echo $xxx_list|sed s/sprintf//`" 
-    xxx_list="sprintf $xxx_list"
-    case "$d_qgcvt" in
-    "$define") xxx_list="qgcvt $xxx_list" ;;
-    esac
+: first add preferred functions to our list
+xxx_list=""
+for xxx_convert in $gconvert_preference; do
+    case $xxx_convert in
+    gcvt|gconvert|sprintf) xxx_list="$xxx_list $xxx_convert" ;;
+    *) echo "Discarding unrecognized gconvert_preference $xxx_convert" >&4 ;;
+    esac 
+done
+: then add any others
+for xxx_convert in gconvert gcvt sprintf; do
+    case "$xxx_list" in
+    *$xxx_convert*) ;;
+    *) xxx_list="$xxx_list $xxx_convert" ;;
+    esac 
+done
+
+case "$d_longdbl$uselongdouble" in
+"$define$define")
+    : again, add prefered functions to our list first
+    xxx_ld_list=""
+    for xxx_convert in $gconvert_ld_preference; do
+        case $xxx_convert in
+        qgcvt|gcvt|gconvert|sprintf) xxx_ld_list="$xxx_ld_list $xxx_convert" ;;
+        *) echo "Discarding unrecognized gconvert_ld_preference $xxx_convert" ;;
+        esac
+    done
+    : then add qgcvt, sprintf--then, in xxx_list order, gconvert and gcvt
+    for xxx_convert in qgcvt sprintf $xxx_list; do
+        case "$xxx_ld_list" in
+        $xxx_convert*|*" $xxx_convert"*) ;;
+        *) xxx_ld_list="$xxx_ld_list $xxx_convert" ;;
+        esac
+    done
+    : if sprintf cannot do long doubles, move it to the end
+    if test "$d_PRIgldbl" != "$define"; then
+        xxx_ld_list="`echo $xxx_ld_list|sed s/sprintf//` sprintf"
+    fi
+    : if no qgcvt, remove it
+    if test "$d_qgcvt" != "$define"; then
+        xxx_ld_list="`echo $xxx_ld_list|sed s/qgcvt//`"
+    fi
+    : use the ld_list
+    xxx_list="$xxx_ld_list"
     ;;
 esac
 
@@ -8796,12 +9514,19 @@ for xxx_convert in $xxx_list; do
 			break;
 		else
 			echo "...But $xxx_convert didn't work as I expected."
+			xxx_convert=''
 		fi
 	else
 		echo "$xxx_convert NOT found." >&4
 	fi
 done
-	
+
+if test X$xxx_convert = X; then
+    echo "*** WHOA THERE!!! ***" >&4
+    echo "None of ($xxx_list)  seemed to work properly.  I'll use sprintf." >&4
+    xxx_convert=sprintf
+fi
+
 case "$xxx_convert" in
 gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
 gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
@@ -8809,11 +9534,15 @@ qgcvt) d_Gconvert='qgcvt((x),(n),(b))' ;;
 *) case "$uselongdouble$d_longdbl$d_PRIgldbl" in
    "$define$define$define")
       d_Gconvert="sprintf((b),\"%.*\"$sPRIgldbl,(n),(x))" ;;
+   "$define$define$undef")
+      d_Gconvert='sprintf((b),"%.*g",(n),(double)(x))' ;;
    *) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
    esac
    ;;  
 esac
 
+fi
+
 : see if _fwalk exists
 set fwalk d__fwalk
 eval $inlibc
@@ -8832,7 +9561,7 @@ eval $inlibc
 case "$d_access" in
 "$define")
 	echo " "
-	$cat >access.c <<'EOCP'
+	$cat >access.c <<EOCP
 #include <sys/types.h>
 #ifdef I_FCNTL
 #include <fcntl.h>
@@ -8843,6 +9572,10 @@ case "$d_access" in
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
 	exit(R_OK);
 }
@@ -8864,15 +9597,295 @@ EOCP
 	fi
 	;;
 esac
-$rm -f access*
-
-: see if accessx exists
-set accessx d_accessx
-eval $inlibc
-
-: see if alarm exists
-set alarm d_alarm
-eval $inlibc
+$rm -f access*
+
+: see if accessx exists
+set accessx d_accessx
+eval $inlibc
+
+: see if aintl exists
+set aintl d_aintl
+eval $inlibc
+
+: see if alarm exists
+set alarm d_alarm
+eval $inlibc
+
+: see if POSIX threads are available
+set pthread.h i_pthread
+eval $inhdr
+
+: define a fucntion to check prototypes
+$cat > protochk <<EOSH
+$startsh
+cc="$cc"
+optimize="$optimize"
+ccflags="$ccflags"
+prototype="$prototype"
+define="$define"
+rm=$rm
+usethreads=$usethreads
+i_pthread=$i_pthread
+pthread_h_first=$pthread_h_first
+EOSH
+
+$cat >> protochk <<'EOSH'
+
+$rm -f try.c
+foo="$1"
+shift
+while test $# -ge 2; do
+	case "$1" in
+		$define) echo "#include <$2>" >> try.c ;;
+		literal) echo "$2" >> try.c ;;
+	esac
+    # Extra magic for the benefit of systems that need pthread.h
+    # to be included early to correctly detect threadsafe functions.
+    # Such functions must guarantee themselves, though, that the usethreads
+    # and i_pthread have been defined, before calling protochk.
+    if test "$usethreads" = "$define" -a "$i_pthread" = "$define" -a "$pthread_h_first" = "$define" -a "$pthread_h_done" = ""; then
+	echo "#include <pthread.h>" >> try.c
+	pthread_h_done=yes
+    fi
+    shift 2
+done
+test "$prototype" = "$define"  && echo '#define CAN_PROTOTYPE' >> try.c
+cat >> try.c <<'EOCP'
+#ifdef CAN_PROTOTYPE
+#define	_(args) args
+#else
+#define	_(args) ()
+#endif
+EOCP
+echo "$foo" >> try.c
+echo 'int no_real_function_has_this_name _((void)) { return 0; }' >> try.c
+$cc $optimize $ccflags -c try.c > /dev/null 2>&1
+status=$?
+$rm -f try.[co]
+exit $status
+EOSH
+chmod +x protochk
+$eunicefix protochk
+
+hasproto='varname=$1; func=$2; shift; shift;
+while $test $# -ge 2; do
+	case "$1" in
+	$define) echo "#include <$2>";;
+	esac ;
+    shift 2;
+done > try.c;
+$cppstdin $cppflags $cppminus < try.c > tryout.c 2>/dev/null;
+if $contains "$func.*(" tryout.c >/dev/null 2>&1; then
+	echo "$func() prototype found.";
+	val="$define";
+else
+	echo "$func() prototype NOT found.";
+	val="$undef";
+fi;
+set $varname;
+eval $setvar;
+$rm -f try.c tryout.c'
+
+: see if sys/types.h has to be included
+set sys/types.h i_systypes
+eval $inhdr
+
+: see if sys/select.h has to be included
+set sys/select.h i_sysselct
+eval $inhdr
+
+hasfield='varname=$1; struct=$2; field=$3; shift; shift; shift;
+while $test $# -ge 2; do
+	case "$1" in
+	$define) echo "#include <$2>";;
+	esac ;
+    shift 2;
+done > try.c;
+echo "int main () { struct $struct foo; char* bar; bar = (char*)foo.$field; }" >> try.c;
+set try;
+if eval $compile; then
+	val="$define";
+else
+	val="$undef";
+fi;
+set $varname;
+eval $setvar;
+$rm -f try.c try.o'
+
+: see if we should include time.h, sys/time.h, or both
+echo " "
+if test "X$timeincl" = X; then
+	echo "Testing to see if we should include <time.h>, <sys/time.h> or both." >&4
+	$echo $n "I'm now running the test program...$c"
+	$cat >try.c <<EOCP
+#include <sys/types.h>
+#ifdef I_TIME
+#include <time.h>
+#endif
+#ifdef I_SYSTIME
+#ifdef SYSTIMEKERNEL
+#define KERNEL
+#endif
+#include <sys/time.h>
+#endif
+#ifdef I_SYSSELECT
+#include <sys/select.h>
+#endif
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+int main()
+{
+	struct tm foo;
+#ifdef S_TIMEVAL
+	struct timeval bar;
+#endif
+#ifdef S_TIMEZONE
+	struct timezone tzp;
+#endif
+	if (foo.tm_sec == foo.tm_sec)
+		exit(0);
+#ifdef S_TIMEVAL
+	if (bar.tv_sec == bar.tv_sec)
+		exit(0);
+#endif
+	exit(1);
+}
+EOCP
+	flags=''
+	for s_timezone in '-DS_TIMEZONE' ''; do
+	sysselect=''
+	for s_timeval in '-DS_TIMEVAL' ''; do
+	for i_systimek in '' '-DSYSTIMEKERNEL'; do
+	for i_time in '' '-DI_TIME'; do
+	for i_systime in '-DI_SYSTIME' ''; do
+		case "$flags" in
+		'') $echo $n ".$c"
+			set try $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone
+			if eval $compile; then
+				set X $i_time $i_systime $i_systimek $sysselect $s_timeval
+				shift
+				flags="$*"
+				echo " "
+				$echo $n "Succeeded with $flags$c"
+			fi
+			;;
+		esac
+	done
+	done
+	done
+	done
+	done
+	timeincl=''
+	echo " "
+	case "$flags" in
+	*SYSTIMEKERNEL*) i_systimek="$define"
+		timeincl=`./findhdr sys/time.h`
+		echo "We'll include <sys/time.h> with KERNEL defined." >&4;;
+	*) i_systimek="$undef";;
+	esac
+	case "$flags" in
+	*I_TIME*) i_time="$define"
+		timeincl=`./findhdr time.h`" $timeincl"
+		echo "We'll include <time.h>." >&4;;
+	*) i_time="$undef";;
+	esac
+	case "$flags" in
+	*I_SYSTIME*) i_systime="$define"
+		timeincl=`./findhdr sys/time.h`" $timeincl"
+		echo "We'll include <sys/time.h>." >&4;;
+	*) i_systime="$undef";;
+	esac
+	$rm -f try.c try
+fi
+: see if struct tm knows about tm_zone
+case "$i_systime$i_time" in
+*$define*) 
+        echo " "
+        echo "Checking to see if your struct tm has tm_zone field..." >&4
+        set d_tm_tm_zone tm tm_zone $i_systime sys/time.h $i_time time.h
+        eval $hasfield
+        ;;
+*)      val="$undef"
+        set d_tm_tm_zone
+        eval $setvar
+        ;;
+esac
+case "$d_tm_tm_zone" in
+"$define")      echo "Yes, it does."   ;;
+*)              echo "No, it doesn't." ;;
+esac
+: see if struct tm knows about tm_gmtoff
+case "$i_systime$i_time" in
+*$define*) 
+        echo " "
+        echo "Checking to see if your struct tm has tm_gmtoff field..." >&4
+        set d_tm_tm_gmtoff tm tm_gmtoff $i_systime sys/time.h $i_time time.h
+        eval $hasfield
+        ;;
+*)      val="$undef"
+        set d_tm_tm_gmtoff
+        eval $setvar
+        ;;
+esac
+case "$d_tm_tm_gmtoff" in
+"$define")      echo "Yes, it does."   ;;
+*)              echo "No, it doesn't." ;;
+esac
+
+: see if asctime_r exists
+set asctime_r d_asctime_r
+eval $inlibc
+case "$d_asctime_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h $i_systime sys/time.h"
+	case "$d_asctime_r_proto:$usethreads" in
+	":define")	d_asctime_r_proto=define
+		set d_asctime_r_proto asctime_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_asctime_r_proto" in
+	define)
+	case "$asctime_r_proto" in
+	''|0) try='char* asctime_r(const struct tm*, char*);'
+	./protochk "extern $try" $hdrs && asctime_r_proto=B_SB ;;
+	esac
+	case "$asctime_r_proto" in
+	''|0) try='char* asctime_r(const struct tm*, char*, int);'
+	./protochk "extern $try" $hdrs && asctime_r_proto=B_SBI ;;
+	esac
+	case "$asctime_r_proto" in
+	''|0) try='int asctime_r(const struct tm*, char*);'
+	./protochk "extern $try" $hdrs && asctime_r_proto=I_SB ;;
+	esac
+	case "$asctime_r_proto" in
+	''|0) try='int asctime_r(const struct tm*, char*, int);'
+	./protochk "extern $try" $hdrs && asctime_r_proto=I_SBI ;;
+	esac
+	case "$asctime_r_proto" in
+	''|0)	d_asctime_r=undef
+ 	        asctime_r_proto=0
+		echo "Disabling asctime_r, cannot determine prototype." >&4 ;;
+	* )	case "$asctime_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) asctime_r_proto="REENTRANT_PROTO_$asctime_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "asctime_r has no prototype, not using it." >&4 ;;
+		esac
+		d_asctime_r=undef
+		asctime_r_proto=0
+		;;
+	esac
+	;;
+*)	asctime_r_proto=0
+	;;
+esac
 
 : see if atolf exists
 set atolf d_atolf
@@ -8882,26 +9895,199 @@ eval $inlibc
 set atoll d_atoll
 eval $inlibc
 
-: Look for GNU-cc style attribute checking
+: Look for GCC-style attribute format
+case "$d_attribute_format" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((format)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+void my_special_printf(char* pat,...) __attribute__((__format__(__printf__,1,2)));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((format))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((format))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_format" ;;
+esac
+set d_attribute_format
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute malloc
+case "$d_attribute_malloc" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((malloc)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+char *go_get_some_memory( int how_many_bytes ) __attribute__((malloc));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((malloc))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((malloc))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_malloc" ;;
+esac
+set d_attribute_malloc
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute nonnull
+case "$d_attribute_nonnull" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((nonnull(1))) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+void do_something (char *some_pointer,...) __attribute__((nonnull(1)));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((nonnull))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((nonnull))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_nonnull" ;;
+esac
+set d_attribute_nonnull
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute noreturn
+case "$d_attribute_noreturn" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((noreturn)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+void fall_over_dead( void ) __attribute__((noreturn));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((noreturn))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((noreturn))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_noreturn" ;;
+esac
+set d_attribute_noreturn
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute pure
+case "$d_attribute_pure" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((pure)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+int square( int n ) __attribute__((pure));
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((pure))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((pure))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_pure" ;;
+esac
+set d_attribute_pure
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute unused
+case "$d_attribute_unused" in
+'')
+echo " "
+echo "Checking whether your compiler can handle __attribute__((unused)) ..." >&4
+$cat >attrib.c <<'EOCP'
+#include <stdio.h>
+int do_something( int dummy __attribute__((unused)), int n );
+EOCP
+if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
+	if $contains 'warning' attrib.out >/dev/null 2>&1; then
+		echo "Your C compiler doesn't support __attribute__((unused))."
+		val="$undef"
+	else
+		echo "Your C compiler supports __attribute__((unused))."
+		val="$define"
+	fi
+else
+	echo "Your C compiler doesn't seem to understand __attribute__ at all."
+	val="$undef"
+fi
+;;
+*) val="$d_attribute_unused" ;;
+esac
+set d_attribute_unused
+eval $setvar
+$rm -f attrib*
+
+: Look for GCC-style attribute warn_unused_result
+case "$d_attribute_warn_unused_result" in
+'')
 echo " "
-echo "Checking whether your compiler can handle __attribute__ ..." >&4
+echo "Checking whether your compiler can handle __attribute__((warn_unused_result)) ..." >&4
 $cat >attrib.c <<'EOCP'
 #include <stdio.h>
-void croak (char* pat,...) __attribute__((format(printf,1,2),noreturn));
+int I_will_not_be_ignored(void) __attribute__((warn_unused_result));
 EOCP
 if $cc $ccflags -c attrib.c >attrib.out 2>&1 ; then
 	if $contains 'warning' attrib.out >/dev/null 2>&1; then
-		echo "Your C compiler doesn't fully support __attribute__."
+		echo "Your C compiler doesn't support __attribute__((warn_unused_result))."
 		val="$undef"
 	else
-		echo "Your C compiler supports __attribute__."
+		echo "Your C compiler supports __attribute__((warn_unused_result))."
 		val="$define"
 	fi
 else
 	echo "Your C compiler doesn't seem to understand __attribute__ at all."
 	val="$undef"
 fi
-set d_attribut
+;;
+*) val="$d_attribute_warn_unused_result" ;;
+esac
+set d_attribute_warn_unused_result
 eval $setvar
 $rm -f attrib*
 
@@ -8931,6 +10117,10 @@ case "$d_getpgrp" in
 #ifdef I_UNISTD
 #  include <unistd.h>
 #endif
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main()
 {
 	if (getuid() == 0) {
@@ -8993,6 +10183,10 @@ case "$d_setpgrp" in
 #ifdef I_UNISTD
 #  include <unistd.h>
 #endif
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main()
 {
 	if (getuid() == 0) {
@@ -9098,6 +10292,10 @@ else
 fi
 $cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <sys/types.h>
 #include <signal.h>
 $signal_t blech(s) int s; { exit(3); }
@@ -9118,7 +10316,7 @@ int main()
 	i32  = ($xxx) g;
 
 	/* x86 processors will probably give 0x8000 0000, which is a
-       sign change.  We don't want that.  We want to mimic SPARC
+	   sign change.  We don't want that.  We want to mimic SPARC
 	   behavior here, which is to preserve the sign and give
 	   back 0x7fff ffff.
 	*/
@@ -9152,6 +10350,10 @@ echo " "
 echo 'Checking whether your C compiler can cast negative float to unsigned.' >&4
 $cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <sys/types.h>
 #include <signal.h>
 $signal_t blech(s) int s; { exit(7); }
@@ -9248,8 +10450,12 @@ echo " "
 if set vprintf val -f d_vprintf; eval $csym; $val; then
 	echo 'vprintf() found.' >&4
 	val="$define"
-	$cat >try.c <<'EOF'
+	$cat >try.c <<EOF
 #include <varargs.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 
 int main() { xxx("foo"); }
 
@@ -9299,6 +10505,10 @@ eval $inlibc
 set class d_class
 eval $inlibc
 
+: see if clearenv exists
+set clearenv d_clearenv
+eval $inlibc
+
 hasstruct='varname=$1; struct=$2; shift; shift;
 while $test $# -ge 2; do
 	case "$1" in
@@ -9317,28 +10527,6 @@ set $varname;
 eval $setvar;
 $rm -f try.c try.o'
 
-: see if sys/types.h has to be included
-set sys/types.h i_systypes
-eval $inhdr
-
-hasfield='varname=$1; struct=$2; field=$3; shift; shift; shift;
-while $test $# -ge 2; do
-	case "$1" in
-	$define) echo "#include <$2>";;
-	esac ;
-    shift 2;
-done > try.c;
-echo "int main () { struct $struct foo; char* bar; bar = (char*)foo.$field; }" >> try.c;
-set try;
-if eval $compile; then
-	val="$define";
-else
-	val="$undef";
-fi;
-set $varname;
-eval $setvar;
-$rm -f try.c try.o'
-
 socketlib=''
 sockethdr=''
 : see whether socket exists
@@ -9458,6 +10646,10 @@ fi
 set d_const
 eval $setvar
 
+: see if copysignl exists
+set copysignl d_copysignl
+eval $inlibc
+
 : see if crypt exists
 echo " "
 set crypt d_crypt
@@ -9497,6 +10689,55 @@ $define) cryptlib='' ;;
 	;;
 esac
 
+: see if this is a crypt.h system
+set crypt.h i_crypt
+eval $inhdr
+
+: see if crypt_r exists
+set crypt_r d_crypt_r
+eval $inlibc
+case "$d_crypt_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_crypt crypt.h"
+	case "$d_crypt_r_proto:$usethreads" in
+	":define")	d_crypt_r_proto=define
+		set d_crypt_r_proto crypt_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_crypt_r_proto" in
+	define)
+	case "$crypt_r_proto" in
+	''|0) try='char* crypt_r(const char*, const char*, struct crypt_data*);'
+	./protochk "extern $try" $hdrs && crypt_r_proto=B_CCS ;;
+	esac
+	case "$crypt_r_proto" in
+	''|0) try='char* crypt_r(const char*, const char*, CRYPTD*);'
+	./protochk "extern $try" $hdrs && crypt_r_proto=B_CCD ;;
+	esac
+	case "$crypt_r_proto" in
+	''|0)	d_crypt_r=undef
+ 	        crypt_r_proto=0
+		echo "Disabling crypt_r, cannot determine prototype." >&4 ;;
+	* )	case "$crypt_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) crypt_r_proto="REENTRANT_PROTO_$crypt_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "crypt_r has no prototype, not using it." >&4 ;;
+		esac
+		d_crypt_r=undef
+		crypt_r_proto=0
+		;;
+	esac
+	;;
+*)	crypt_r_proto=0
+	;;
+esac
+
 : get csh whereabouts
 case "$csh" in
 'csh') val="$undef" ;;
@@ -9509,6 +10750,100 @@ case "$full_csh" in
 '') full_csh=$csh ;;
 esac
 
+: see if ctermid_r exists
+set ctermid_r d_ctermid_r
+eval $inlibc
+case "$d_ctermid_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h "
+	case "$d_ctermid_r_proto:$usethreads" in
+	":define")	d_ctermid_r_proto=define
+		set d_ctermid_r_proto ctermid_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_ctermid_r_proto" in
+	define)
+	case "$ctermid_r_proto" in
+	''|0) try='char* ctermid_r(char*);'
+	./protochk "extern $try" $hdrs && ctermid_r_proto=B_B ;;
+	esac
+	case "$ctermid_r_proto" in
+	''|0)	d_ctermid_r=undef
+ 	        ctermid_r_proto=0
+		echo "Disabling ctermid_r, cannot determine prototype." >&4 ;;
+	* )	case "$ctermid_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) ctermid_r_proto="REENTRANT_PROTO_$ctermid_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "ctermid_r has no prototype, not using it." >&4 ;;
+		esac
+		d_ctermid_r=undef
+		ctermid_r_proto=0
+		;;
+	esac
+	;;
+*)	ctermid_r_proto=0
+	;;
+esac
+
+: see if ctime_r exists
+set ctime_r d_ctime_r
+eval $inlibc
+case "$d_ctime_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h $i_systime sys/time.h"
+	case "$d_ctime_r_proto:$usethreads" in
+	":define")	d_ctime_r_proto=define
+		set d_ctime_r_proto ctime_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_ctime_r_proto" in
+	define)
+	case "$ctime_r_proto" in
+	''|0) try='char* ctime_r(const time_t*, char*);'
+	./protochk "extern $try" $hdrs && ctime_r_proto=B_SB ;;
+	esac
+	case "$ctime_r_proto" in
+	''|0) try='char* ctime_r(const time_t*, char*, int);'
+	./protochk "extern $try" $hdrs && ctime_r_proto=B_SBI ;;
+	esac
+	case "$ctime_r_proto" in
+	''|0) try='int ctime_r(const time_t*, char*);'
+	./protochk "extern $try" $hdrs && ctime_r_proto=I_SB ;;
+	esac
+	case "$ctime_r_proto" in
+	''|0) try='int ctime_r(const time_t*, char*, int);'
+	./protochk "extern $try" $hdrs && ctime_r_proto=I_SBI ;;
+	esac
+	case "$ctime_r_proto" in
+	''|0)	d_ctime_r=undef
+ 	        ctime_r_proto=0
+		echo "Disabling ctime_r, cannot determine prototype." >&4 ;;
+	* )	case "$ctime_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) ctime_r_proto="REENTRANT_PROTO_$ctime_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "ctime_r has no prototype, not using it." >&4 ;;
+		esac
+		d_ctime_r=undef
+		ctime_r_proto=0
+		;;
+	esac
+	;;
+*)	ctime_r_proto=0
+	;;
+esac
+
 : see if cuserid exists
 set cuserid d_cuserid
 eval $inlibc
@@ -9536,36 +10871,17 @@ $cat >dbl_dig.c <<EOM
 printf("Contains DBL_DIG");
 #endif
 EOM
-$cppstdin $cppflags $cppminus < dbl_dig.c >dbl_dig.E 2>/dev/null
-if $contains 'DBL_DIG' dbl_dig.E >/dev/null 2>&1; then
-	echo "DBL_DIG found." >&4
-	val="$define"
-else
-	echo "DBL_DIG NOT found." >&4
-	val="$undef"
-fi
-$rm -f dbl_dig.?
-set d_dbl_dig
-eval $setvar
-
-hasproto='varname=$1; func=$2; shift; shift;
-while $test $# -ge 2; do
-	case "$1" in
-	$define) echo "#include <$2>";;
-	esac ;
-    shift 2;
-done > try.c;
-$cppstdin $cppflags $cppminus < try.c > tryout.c 2>/dev/null;
-if $contains "$func.*(" tryout.c >/dev/null 2>&1; then
-	echo "$func() prototype found.";
-	val="$define";
+$cppstdin $cppflags $cppminus < dbl_dig.c >dbl_dig.E 2>/dev/null
+if $contains 'DBL_DIG' dbl_dig.E >/dev/null 2>&1; then
+	echo "DBL_DIG found." >&4
+	val="$define"
 else
-	echo "$func() prototype NOT found.";
-	val="$undef";
-fi;
-set $varname;
-eval $setvar;
-$rm -f try.c tryout.c'
+	echo "DBL_DIG NOT found." >&4
+	val="$undef"
+fi
+$rm -f dbl_dig.?
+set d_dbl_dig
+eval $setvar
 
 : see if dbm.h is available
 : see if dbmclose exists
@@ -9686,6 +11002,10 @@ eval $inhdr
 echo " "
 $cat >dirfd.c <<EOM
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #$i_dirent I_DIRENT		/**/
 #$i_sysdir I_SYS_DIR		/**/
 #$i_sysndir I_SYS_NDIR		/**/
@@ -9719,6 +11039,7 @@ int main() {
 		exit(1);
 }
 EOM
+val=$undef
 set dirfd
 if eval $compile; then
 	val="$define"
@@ -9778,6 +11099,10 @@ EOM
 $cat >fred.c<<EOM
 
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #$i_dlfcn I_DLFCN
 #ifdef I_DLFCN
 #include <dlfcn.h>      /* the dynamic linker include file for SunOS/Solaris */
@@ -9848,6 +11173,47 @@ $rm -f fred fred.* dyna.$dlext dyna.* tmp-dyna.*
 set d_dlsymun
 eval $setvar
 
+: see if drand48_r exists
+set drand48_r d_drand48_r
+eval $inlibc
+case "$d_drand48_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "$d_drand48_r_proto:$usethreads" in
+	":define")	d_drand48_r_proto=define
+		set d_drand48_r_proto drand48_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_drand48_r_proto" in
+	define)
+	case "$drand48_r_proto" in
+	''|0) try='int drand48_r(struct drand48_data*, double*);'
+	./protochk "extern $try" $hdrs && drand48_r_proto=I_ST ;;
+	esac
+	case "$drand48_r_proto" in
+	''|0)	d_drand48_r=undef
+ 	        drand48_r_proto=0
+		echo "Disabling drand48_r, cannot determine prototype." >&4 ;;
+	* )	case "$drand48_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) drand48_r_proto="REENTRANT_PROTO_$drand48_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "drand48_r has no prototype, not using it." >&4 ;;
+		esac
+		d_drand48_r=undef
+		drand48_r_proto=0
+		;;
+	esac
+	;;
+*)	drand48_r_proto=0
+	;;
+esac
+
 : see if prototype for drand48 is available
 echo " "
 set d_drand48proto drand48 $i_stdlib stdlib.h $i_unistd unistd.h
@@ -9865,29 +11231,416 @@ eval $inlibc
 set endgrent d_endgrent
 eval $inlibc
 
+: see if this is an grp system
+set grp.h i_grp
+eval $inhdr
+
+case "$i_grp" in
+$define)
+	xxx=`./findhdr grp.h`
+	$cppstdin $cppflags $cppminus < $xxx >$$.h
+
+	if $contains 'gr_passwd' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_grpasswd
+	eval $setvar
+
+	$rm -f $$.h
+	;;
+*)
+	val="$undef";
+	set d_grpasswd; eval $setvar
+	;;
+esac
+
+: see if endgrent_r exists
+set endgrent_r d_endgrent_r
+eval $inlibc
+case "$d_endgrent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "$d_endgrent_r_proto:$usethreads" in
+	":define")	d_endgrent_r_proto=define
+		set d_endgrent_r_proto endgrent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endgrent_r_proto" in
+	define)
+	case "$endgrent_r_proto" in
+	''|0) try='int endgrent_r(FILE**);'
+	./protochk "extern $try" $hdrs && endgrent_r_proto=I_H ;;
+	esac
+	case "$endgrent_r_proto" in
+	''|0) try='void endgrent_r(FILE**);'
+	./protochk "extern $try" $hdrs && endgrent_r_proto=V_H ;;
+	esac
+	case "$endgrent_r_proto" in
+	''|0)	d_endgrent_r=undef
+ 	        endgrent_r_proto=0
+		echo "Disabling endgrent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endgrent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endgrent_r_proto="REENTRANT_PROTO_$endgrent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endgrent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endgrent_r=undef
+		endgrent_r_proto=0
+		;;
+	esac
+	;;
+*)	endgrent_r_proto=0
+	;;
+esac
+
 : see if endhostent exists
 set endhostent d_endhent
 eval $inlibc
 
+: see if this is a netdb.h system
+set netdb.h i_netdb
+eval $inhdr
+
+: see if endhostent_r exists
+set endhostent_r d_endhostent_r
+eval $inlibc
+case "$d_endhostent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_endhostent_r_proto:$usethreads" in
+	":define")	d_endhostent_r_proto=define
+		set d_endhostent_r_proto endhostent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endhostent_r_proto" in
+	define)
+	case "$endhostent_r_proto" in
+	''|0) try='int endhostent_r(struct hostent_data*);'
+	./protochk "extern $try" $hdrs && endhostent_r_proto=I_D ;;
+	esac
+	case "$endhostent_r_proto" in
+	''|0) try='void endhostent_r(struct hostent_data*);'
+	./protochk "extern $try" $hdrs && endhostent_r_proto=V_D ;;
+	esac
+	case "$endhostent_r_proto" in
+	''|0)	d_endhostent_r=undef
+ 	        endhostent_r_proto=0
+		echo "Disabling endhostent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endhostent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endhostent_r_proto="REENTRANT_PROTO_$endhostent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endhostent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endhostent_r=undef
+		endhostent_r_proto=0
+		;;
+	esac
+	;;
+*)	endhostent_r_proto=0
+	;;
+esac
+
 : see if endnetent exists
 set endnetent d_endnent
 eval $inlibc
 
+: see if endnetent_r exists
+set endnetent_r d_endnetent_r
+eval $inlibc
+case "$d_endnetent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_endnetent_r_proto:$usethreads" in
+	":define")	d_endnetent_r_proto=define
+		set d_endnetent_r_proto endnetent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endnetent_r_proto" in
+	define)
+	case "$endnetent_r_proto" in
+	''|0) try='int endnetent_r(struct netent_data*);'
+	./protochk "extern $try" $hdrs && endnetent_r_proto=I_D ;;
+	esac
+	case "$endnetent_r_proto" in
+	''|0) try='void endnetent_r(struct netent_data*);'
+	./protochk "extern $try" $hdrs && endnetent_r_proto=V_D ;;
+	esac
+	case "$endnetent_r_proto" in
+	''|0)	d_endnetent_r=undef
+ 	        endnetent_r_proto=0
+		echo "Disabling endnetent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endnetent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endnetent_r_proto="REENTRANT_PROTO_$endnetent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endnetent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endnetent_r=undef
+		endnetent_r_proto=0
+		;;
+	esac
+	;;
+*)	endnetent_r_proto=0
+	;;
+esac
+
 : see if endprotoent exists
 set endprotoent d_endpent
 eval $inlibc
 
+: see if endprotoent_r exists
+set endprotoent_r d_endprotoent_r
+eval $inlibc
+case "$d_endprotoent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_endprotoent_r_proto:$usethreads" in
+	":define")	d_endprotoent_r_proto=define
+		set d_endprotoent_r_proto endprotoent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endprotoent_r_proto" in
+	define)
+	case "$endprotoent_r_proto" in
+	''|0) try='int endprotoent_r(struct protoent_data*);'
+	./protochk "extern $try" $hdrs && endprotoent_r_proto=I_D ;;
+	esac
+	case "$endprotoent_r_proto" in
+	''|0) try='void endprotoent_r(struct protoent_data*);'
+	./protochk "extern $try" $hdrs && endprotoent_r_proto=V_D ;;
+	esac
+	case "$endprotoent_r_proto" in
+	''|0)	d_endprotoent_r=undef
+ 	        endprotoent_r_proto=0
+		echo "Disabling endprotoent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endprotoent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endprotoent_r_proto="REENTRANT_PROTO_$endprotoent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endprotoent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endprotoent_r=undef
+		endprotoent_r_proto=0
+		;;
+	esac
+	;;
+*)	endprotoent_r_proto=0
+	;;
+esac
+
 : see if endpwent exists
 set endpwent d_endpwent
 eval $inlibc
 
+: see if this is a pwd.h system
+set pwd.h i_pwd
+eval $inhdr
+
+case "$i_pwd" in
+$define)
+	xxx=`./findhdr pwd.h`
+	$cppstdin $cppflags $cppminus < $xxx >$$.h
+
+	if $contains 'pw_quota' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwquota
+	eval $setvar
+
+	if $contains 'pw_age' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwage
+	eval $setvar
+
+	if $contains 'pw_change' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwchange
+	eval $setvar
+
+	if $contains 'pw_class' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwclass
+	eval $setvar
+
+	if $contains 'pw_expire' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwexpire
+	eval $setvar
+
+	if $contains 'pw_comment' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwcomment
+	eval $setvar
+
+	if $contains 'pw_gecos' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwgecos
+	eval $setvar
+
+	if $contains 'pw_passwd' $$.h >/dev/null 2>&1; then
+		val="$define"
+	else
+		val="$undef"
+	fi
+	set d_pwpasswd
+	eval $setvar
+
+	$rm -f $$.h
+	;;
+*)
+	val="$undef"; 
+	set d_pwquota; eval $setvar
+	set d_pwage; eval $setvar
+	set d_pwchange; eval $setvar
+	set d_pwclass; eval $setvar
+	set d_pwexpire; eval $setvar
+	set d_pwcomment; eval $setvar
+	set d_pwgecos; eval $setvar
+	set d_pwpasswd; eval $setvar
+	;;
+esac
+
+: see if endpwent_r exists
+set endpwent_r d_endpwent_r
+eval $inlibc
+case "$d_endpwent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "$d_endpwent_r_proto:$usethreads" in
+	":define")	d_endpwent_r_proto=define
+		set d_endpwent_r_proto endpwent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endpwent_r_proto" in
+	define)
+	case "$endpwent_r_proto" in
+	''|0) try='int endpwent_r(FILE**);'
+	./protochk "extern $try" $hdrs && endpwent_r_proto=I_H ;;
+	esac
+	case "$endpwent_r_proto" in
+	''|0) try='void endpwent_r(FILE**);'
+	./protochk "extern $try" $hdrs && endpwent_r_proto=V_H ;;
+	esac
+	case "$endpwent_r_proto" in
+	''|0)	d_endpwent_r=undef
+ 	        endpwent_r_proto=0
+		echo "Disabling endpwent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endpwent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endpwent_r_proto="REENTRANT_PROTO_$endpwent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endpwent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endpwent_r=undef
+		endpwent_r_proto=0
+		;;
+	esac
+	;;
+*)	endpwent_r_proto=0
+	;;
+esac
+
 : see if endservent exists
 set endservent d_endsent
 eval $inlibc
 
+: see if endservent_r exists
+set endservent_r d_endservent_r
+eval $inlibc
+case "$d_endservent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_endservent_r_proto:$usethreads" in
+	":define")	d_endservent_r_proto=define
+		set d_endservent_r_proto endservent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_endservent_r_proto" in
+	define)
+	case "$endservent_r_proto" in
+	''|0) try='int endservent_r(struct servent_data*);'
+	./protochk "extern $try" $hdrs && endservent_r_proto=I_D ;;
+	esac
+	case "$endservent_r_proto" in
+	''|0) try='void endservent_r(struct servent_data*);'
+	./protochk "extern $try" $hdrs && endservent_r_proto=V_D ;;
+	esac
+	case "$endservent_r_proto" in
+	''|0)	d_endservent_r=undef
+ 	        endservent_r_proto=0
+		echo "Disabling endservent_r, cannot determine prototype." >&4 ;;
+	* )	case "$endservent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) endservent_r_proto="REENTRANT_PROTO_$endservent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "endservent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_endservent_r=undef
+		endservent_r_proto=0
+		;;
+	esac
+	;;
+*)	endservent_r_proto=0
+	;;
+esac
+
 : Locate the flags for 'open()'
 echo " "
-$cat >try.c <<'EOCP'
+$cat >try.c <<EOCP
 #include <sys/types.h>
 #ifdef I_FCNTL
 #include <fcntl.h>
@@ -9895,6 +11648,10 @@ $cat >try.c <<'EOCP'
 #ifdef I_SYS_FILE
 #include <sys/file.h>
 #endif
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
 	if(O_RDONLY);
 #ifdef O_TRUNC
@@ -10027,7 +11784,10 @@ case "$o_nonblock" in
 	$cat head.c > try.c
 	$cat >>try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
 #include <stdlib.h>
+#endif
 #$i_fcntl I_FCNTL
 #ifdef I_FCNTL
 #include <fcntl.h>
@@ -10073,7 +11833,10 @@ case "$eagain" in
 #include <sys/types.h>
 #include <signal.h>
 #include <stdio.h> 
-#include <stdlib.h> 
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #$i_fcntl I_FCNTL
 #ifdef I_FCNTL
 #include <fcntl.h>
@@ -10142,77 +11905,362 @@ int main()
 		exit(0);
 	}
 
-	close(pd[0]);			/* We write to pd[1] */
-	close(pu[1]);			/* We read from pu[0] */
-	read(pu[0], buf, 1);	/* Wait for parent to signal us we may continue */
-	close(pd[1]);			/* Pipe pd is now fully closed! */
-	exit(0);				/* Bye bye, thank you for playing! */
+	close(pd[0]);			/* We write to pd[1] */
+	close(pu[1]);			/* We read from pu[0] */
+	read(pu[0], buf, 1);	/* Wait for parent to signal us we may continue */
+	close(pd[1]);			/* Pipe pd is now fully closed! */
+	exit(0);				/* Bye bye, thank you for playing! */
+}
+EOCP
+	set try
+	if eval $compile_ok; then
+		echo "$startsh" >mtry
+		echo "$run ./try >try.out 2>try.ret 4>try.err || exit 4" >>mtry
+		chmod +x mtry
+		./mtry >/dev/null 2>&1
+		case $? in
+		0) eagain=`$cat try.out`;;
+		1) echo "Could not perform non-blocking setting!";;
+		2) echo "I did a successful read() for something that was not there!";;
+		3) echo "Hmm... non-blocking I/O does not seem to be working!";;
+		4) echo "Could not find F_SETFL!";;
+		*) echo "Something terribly wrong happened during testing.";;
+		esac
+		rd_nodata=`$cat try.ret`
+		echo "A read() system call with no data present returns $rd_nodata."
+		case "$rd_nodata" in
+		0|-1) ;;
+		*)
+			echo "(That's peculiar, fixing that to be -1.)"
+			rd_nodata=-1
+			;;
+		esac
+		case "$eagain" in
+		'')
+			echo "Forcing errno EAGAIN on read() with no data available."
+			eagain=EAGAIN
+			;;
+		*)
+			echo "Your read() sets errno to $eagain when no data is available."
+			;;
+		esac
+		status=`$cat try.err`
+		case "$status" in
+		0) echo "And it correctly returns 0 to signal EOF.";;
+		-1) echo "But it also returns -1 to signal EOF, so be careful!";;
+		*) echo "However, your read() returns '$status' on EOF??";;
+		esac
+		val="$define"
+		if test "$status" = "$rd_nodata"; then
+			echo "WARNING: you can't distinguish between EOF and no data!"
+			val="$undef"
+		fi
+	else
+		echo "I can't compile the test program--assuming errno EAGAIN will do."
+		eagain=EAGAIN
+	fi
+	set d_eofnblk
+	eval $setvar
+	;;
+*)
+	echo "Using $hint value $eagain."
+	echo "Your read() returns $rd_nodata when no data is present."
+	case "$d_eofnblk" in
+	"$define") echo "And you can see EOF because read() returns 0.";;
+	"$undef") echo "But you can't see EOF status from read() returned value.";;
+	*)
+		echo "(Assuming you can't see EOF status from read anyway.)"
+		d_eofnblk=$undef
+		;;
+	esac
+	;;
+esac
+$rm -f try try.* .out core head.c mtry
+
+: see if _ptr and _cnt from stdio act std
+echo " "
+
+if $contains '_lbfsize' `./findhdr stdio.h` >/dev/null 2>&1 ; then
+	echo "(Looks like you have stdio.h from BSD.)"
+	case "$stdio_ptr" in
+	'') stdio_ptr='((fp)->_p)'
+		ptr_lval=$define
+		;;
+	*)	ptr_lval=$d_stdio_ptr_lval;;
+	esac
+	case "$stdio_cnt" in
+	'') stdio_cnt='((fp)->_r)'
+		cnt_lval=$define
+		;;
+	*)	cnt_lval=$d_stdio_cnt_lval;;
+	esac
+	case "$stdio_base" in
+	'') stdio_base='((fp)->_ub._base ? (fp)->_ub._base : (fp)->_bf._base)';;
+	esac
+	case "$stdio_bufsiz" in
+	'') stdio_bufsiz='((fp)->_ub._base ? (fp)->_ub._size : (fp)->_bf._size)';;
+	esac
+elif $contains '_IO_fpos_t' `./findhdr stdio.h` `./findhdr libio.h` >/dev/null 2>&1 ; then
+	echo "(Looks like you have stdio.h from Linux.)"
+	case "$stdio_ptr" in
+	'') stdio_ptr='((fp)->_IO_read_ptr)'
+		ptr_lval=$define
+		;;
+	*)	ptr_lval=$d_stdio_ptr_lval;;
+	esac
+	case "$stdio_cnt" in
+	'') stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+		cnt_lval=$undef
+		;;
+	*)	cnt_lval=$d_stdio_cnt_lval;;
+	esac
+	case "$stdio_base" in
+	'') stdio_base='((fp)->_IO_read_base)';;
+	esac
+	case "$stdio_bufsiz" in
+	'') stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)';;
+	esac
+else
+	case "$stdio_ptr" in
+	'') stdio_ptr='((fp)->_ptr)'
+		ptr_lval=$define
+		;;
+	*)	ptr_lval=$d_stdio_ptr_lval;;
+	esac
+	case "$stdio_cnt" in
+	'') stdio_cnt='((fp)->_cnt)'
+		cnt_lval=$define
+		;;
+	*)	cnt_lval=$d_stdio_cnt_lval;;
+	esac
+	case "$stdio_base" in
+	'') stdio_base='((fp)->_base)';;
+	esac
+	case "$stdio_bufsiz" in
+	'') stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)';;
+	esac
+fi
+
+: test whether _ptr and _cnt really work
+echo "Checking how std your stdio is..." >&4
+$cat >try.c <<EOP
+#include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#define FILE_ptr(fp)	$stdio_ptr
+#define FILE_cnt(fp)	$stdio_cnt
+int main() {
+	FILE *fp = fopen("try.c", "r");
+	char c = getc(fp);
+	if (
+		18 <= FILE_cnt(fp) &&
+		strncmp(FILE_ptr(fp), "include <stdio.h>\n", 18) == 0
+	)
+		exit(0);
+	exit(1);
+}
+EOP
+val="$undef"
+set try
+if eval $compile && $to try.c; then
+	if $run ./try; then
+		echo "Your stdio acts pretty std."
+		val="$define"
+	else
+		echo "Your stdio isn't very std."
+	fi
+else
+	echo "Your stdio doesn't appear very std."
+fi
+$rm -f try.c try
+
+# glibc 2.2.90 and above apparently change stdio streams so Perl's
+# direct buffer manipulation no longer works.  The Configure tests
+# should be changed to correctly detect this, but until then,
+# the following check should at least let perl compile and run.
+# (This quick fix should be updated before 5.8.1.)
+# To be defensive, reject all unknown versions, and all versions  > 2.2.9.
+# A. Dougherty, June 3, 2002.
+case "$d_gnulibc" in
+$define)
+	case "$gnulibc_version" in
+	2.[01]*)  ;;
+	2.2) ;;
+	2.2.[0-9]) ;;
+	*)  echo "But I will not snoop inside glibc $gnulibc_version stdio buffers."
+		val="$undef"
+		;;
+	esac
+	;;
+esac
+set d_stdstdio
+eval $setvar
+
+: Can _ptr be used as an lvalue?
+case "$d_stdstdio$ptr_lval" in
+$define$define) val=$define ;;
+*) val=$undef ;;
+esac
+set d_stdio_ptr_lval
+eval $setvar
+
+: Can _cnt be used as an lvalue?
+case "$d_stdstdio$cnt_lval" in
+$define$define) val=$define ;;
+*) val=$undef ;;
+esac
+set d_stdio_cnt_lval
+eval $setvar
+
+
+: test whether setting _ptr sets _cnt as a side effect
+d_stdio_ptr_lval_sets_cnt="$undef"
+d_stdio_ptr_lval_nochange_cnt="$undef"
+case "$d_stdio_ptr_lval$d_stdstdio" in
+$define$define)
+	echo "Checking to see what happens if we set the stdio ptr..." >&4
+$cat >try.c <<EOP
+#include <stdio.h>
+/* Can we scream? */
+/* Eat dust sed :-) */
+/* In the buffer space, no one can hear you scream. */
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#define FILE_ptr(fp)	$stdio_ptr
+#define FILE_cnt(fp)	$stdio_cnt
+#include <sys/types.h>
+int main() {
+	FILE *fp = fopen("try.c", "r");
+	int c;
+	char *ptr;
+	size_t cnt;
+	if (!fp) {
+	    puts("Fail even to read");
+	    exit(1);
+	}
+	c = getc(fp); /* Read away the first # */
+	if (c == EOF) {
+	    puts("Fail even to read");
+	    exit(1);
+	}
+	if (!(
+		18 <= FILE_cnt(fp) &&
+		strncmp(FILE_ptr(fp), "include <stdio.h>\n", 18) == 0
+	)) {
+		puts("Fail even to read");
+		exit (1);
+	}
+	ptr = (char*) FILE_ptr(fp);
+	cnt = (size_t)FILE_cnt(fp);
+
+	FILE_ptr(fp) += 42;
+
+	if ((char*)FILE_ptr(fp) != (ptr + 42)) {
+		printf("Fail ptr check %p != %p", FILE_ptr(fp), (ptr + 42));
+		exit (1);
+	}
+	if (FILE_cnt(fp) <= 20) {
+		printf ("Fail (<20 chars to test)");
+		exit (1);
+	}
+	if (strncmp(FILE_ptr(fp), "Eat dust sed :-) */\n", 20) != 0) {
+		puts("Fail compare");
+		exit (1);
+	}
+	if (cnt == FILE_cnt(fp)) {
+		puts("Pass_unchanged");
+		exit (0);
+	}	
+	if (FILE_cnt(fp) == (cnt - 42)) {
+		puts("Pass_changed");
+		exit (0);
+	}
+	printf("Fail count was %d now %d\n", cnt, FILE_cnt(fp));
+	return 1;
+
 }
-EOCP
+EOP
 	set try
-	if eval $compile_ok; then
-		echo "$startsh" >mtry
-		echo "$run ./try >try.out 2>try.ret 4>try.err || exit 4" >>mtry
-		chmod +x mtry
-		./mtry >/dev/null 2>&1
-		case $? in
-		0) eagain=`$cat try.out`;;
-		1) echo "Could not perform non-blocking setting!";;
-		2) echo "I did a successful read() for something that was not there!";;
-		3) echo "Hmm... non-blocking I/O does not seem to be working!";;
-		4) echo "Could not find F_SETFL!";;
-		*) echo "Something terribly wrong happened during testing.";;
-		esac
-		rd_nodata=`$cat try.ret`
-		echo "A read() system call with no data present returns $rd_nodata."
-		case "$rd_nodata" in
-		0|-1) ;;
-		*)
-			echo "(That's peculiar, fixing that to be -1.)"
-			rd_nodata=-1
-			;;
-		esac
-		case "$eagain" in
-		'')
-			echo "Forcing errno EAGAIN on read() with no data available."
-			eagain=EAGAIN
-			;;
+	if eval $compile && $to try.c; then
+ 		case `$run ./try` in
+		Pass_changed)
+			echo "Increasing ptr in your stdio decreases cnt by the same amount.  Good." >&4
+			d_stdio_ptr_lval_sets_cnt="$define" ;;
+		Pass_unchanged)
+			echo "Increasing ptr in your stdio leaves cnt unchanged.  Good." >&4
+			d_stdio_ptr_lval_nochange_cnt="$define" ;;
+		Fail*)
+			echo "Increasing ptr in your stdio didn't do exactly what I expected.  We'll not be doing that then." >&4 ;;
 		*)
-			echo "Your read() sets errno to $eagain when no data is available."
-			;;
-		esac
-		status=`$cat try.err`
-		case "$status" in
-		0) echo "And it correctly returns 0 to signal EOF.";;
-		-1) echo "But it also returns -1 to signal EOF, so be careful!";;
-		*) echo "However, your read() returns '$status' on EOF??";;
-		esac
-		val="$define"
-		if test "$status" = "$rd_nodata"; then
-			echo "WARNING: you can't distinguish between EOF and no data!"
-			val="$undef"
+			echo "It appears attempting to set ptr in your stdio is a bad plan." >&4 ;;
+	esac
+	else
+		echo "It seems we can't set ptr in your stdio.  Nevermind." >&4
+	fi
+	$rm -f try.c try
+	;;
+esac
+
+: see if _base is also standard
+val="$undef"
+case "$d_stdstdio" in
+$define)
+	$cat >try.c <<EOP
+#include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#define FILE_base(fp)	$stdio_base
+#define FILE_bufsiz(fp)	$stdio_bufsiz
+int main() {
+	FILE *fp = fopen("try.c", "r");
+	char c = getc(fp);
+	if (
+		19 <= FILE_bufsiz(fp) &&
+		strncmp(FILE_base(fp), "#include <stdio.h>\n", 19) == 0
+	)
+		exit(0);
+	exit(1);
+}
+EOP
+	set try
+	if eval $compile && $to try.c; then
+		if $run ./try; then
+			echo "And its _base field acts std."
+			val="$define"
+		else
+			echo "But its _base field isn't std."
 		fi
 	else
-		echo "I can't compile the test program--assuming errno EAGAIN will do."
-		eagain=EAGAIN
+		echo "However, it seems to be lacking the _base field."
 	fi
-	set d_eofnblk
-	eval $setvar
+	$rm -f try.c try
 	;;
-*)
-	echo "Using $hint value $eagain."
-	echo "Your read() returns $rd_nodata when no data is present."
-	case "$d_eofnblk" in
-	"$define") echo "And you can see EOF because read() returns 0.";;
-	"$undef") echo "But you can't see EOF status from read() returned value.";;
-	*)
-		echo "(Assuming you can't see EOF status from read anyway.)"
-		d_eofnblk=$undef
+esac
+set d_stdiobase
+eval $setvar
+
+: see if fast_stdio exists
+val="$undef"
+case "$d_stdstdio:$d_stdio_ptr_lval" in
+"$define:$define")
+	case "$d_stdio_cnt_lval$d_stdio_ptr_lval_sets_cnt" in
+	*$define*)
+		echo "You seem to have 'fast stdio' to directly manipulate the stdio buffers." >& 4
+		val="$define"
 		;;
 	esac
 	;;
 esac
-$rm -f try try.* .out core head.c mtry
+set d_faststdio
+eval $setvar
+
+
 
 : see if fchdir exists
 set fchdir d_fchdir
@@ -10233,7 +12281,10 @@ eval $inlibc
 echo " "
 : See if fcntl-based locking works.
 $cat >try.c <<EOCP
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
 #include <stdlib.h>
+#endif
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -10260,127 +12311,39 @@ echo "Checking if fcntl-based file locking works... "
 case "$d_fcntl" in
 "$define")
 	set try
-	if eval $compile_ok; then
-		if $run ./try; then
-			echo "Yes, it seems to work."
-			val="$define"
-		else
-			echo "Nope, it didn't work."
-			val="$undef"
-			case "$?" in
-			3) $cat >&4 <<EOM
-***
-*** I had to forcibly timeout from fcntl(..., F_SETLK, ...).
-*** This is (almost) impossible.
-*** If your NFS lock daemons are not feeling well, something like
-*** this may happen, please investigate.  Cannot continue, aborting.
-***
-EOM
-				exit 1
-				;;
-			esac
-		fi
-	else
-		echo "I'm unable to compile the test program, so I'll assume not."
-		val="$undef"
-	fi
-	;;
-*) val="$undef";
-	echo "Nope, since you don't even have fcntl()."
-	;;
-esac
-set d_fcntl_can_lock
-eval $setvar
-$rm -f try*
-
-
-: see if sys/select.h has to be included
-set sys/select.h i_sysselct
-eval $inhdr
-
-: see if we should include time.h, sys/time.h, or both
-echo " "
-if test "X$timeincl" = X; then
-	echo "Testing to see if we should include <time.h>, <sys/time.h> or both." >&4
-	$echo $n "I'm now running the test program...$c"
-	$cat >try.c <<'EOCP'
-#include <sys/types.h>
-#ifdef I_TIME
-#include <time.h>
-#endif
-#ifdef I_SYSTIME
-#ifdef SYSTIMEKERNEL
-#define KERNEL
-#endif
-#include <sys/time.h>
-#endif
-#ifdef I_SYSSELECT
-#include <sys/select.h>
-#endif
-int main()
-{
-	struct tm foo;
-#ifdef S_TIMEVAL
-	struct timeval bar;
-#endif
-#ifdef S_TIMEZONE
-	struct timezone tzp;
-#endif
-	if (foo.tm_sec == foo.tm_sec)
-		exit(0);
-#ifdef S_TIMEVAL
-	if (bar.tv_sec == bar.tv_sec)
-		exit(0);
-#endif
-	exit(1);
-}
-EOCP
-	flags=''
-	for s_timezone in '-DS_TIMEZONE' ''; do
-	sysselect=''
-	for s_timeval in '-DS_TIMEVAL' ''; do
-	for i_systimek in '' '-DSYSTIMEKERNEL'; do
-	for i_time in '' '-DI_TIME'; do
-	for i_systime in '-DI_SYSTIME' ''; do
-		case "$flags" in
-		'') $echo $n ".$c"
-			set try $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone
-			if eval $compile; then
-				set X $i_time $i_systime $i_systimek $sysselect $s_timeval
-				shift
-				flags="$*"
-				echo " "
-				$echo $n "Succeeded with $flags$c"
-			fi
-			;;
-		esac
-	done
-	done
-	done
-	done
-	done
-	timeincl=''
-	echo " "
-	case "$flags" in
-	*SYSTIMEKERNEL*) i_systimek="$define"
-		timeincl=`./findhdr sys/time.h`
-		echo "We'll include <sys/time.h> with KERNEL defined." >&4;;
-	*) i_systimek="$undef";;
-	esac
-	case "$flags" in
-	*I_TIME*) i_time="$define"
-		timeincl=`./findhdr time.h`" $timeincl"
-		echo "We'll include <time.h>." >&4;;
-	*) i_time="$undef";;
-	esac
-	case "$flags" in
-	*I_SYSTIME*) i_systime="$define"
-		timeincl=`./findhdr sys/time.h`" $timeincl"
-		echo "We'll include <sys/time.h>." >&4;;
-	*) i_systime="$undef";;
-	esac
-	$rm -f try.c try
-fi
+	if eval $compile_ok; then
+		if $run ./try; then
+			echo "Yes, it seems to work."
+			val="$define"
+		else
+			echo "Nope, it didn't work."
+			val="$undef"
+			case "$?" in
+			3) $cat >&4 <<EOM
+***
+*** I had to forcibly timeout from fcntl(..., F_SETLK, ...).
+*** This is (almost) impossible.
+*** If your NFS lock daemons are not feeling well, something like
+*** this may happen, please investigate.  Cannot continue, aborting.
+***
+EOM
+				exit 1
+				;;
+			esac
+		fi
+	else
+		echo "I'm unable to compile the test program, so I'll assume not."
+		val="$undef"
+	fi
+	;;
+*) val="$undef";
+	echo "Nope, since you don't even have fcntl()."
+	;;
+esac
+set d_fcntl_can_lock
+eval $setvar
+$rm -f try*
+
 
 : check for fd_set items
 $cat <<EOM
@@ -10388,6 +12351,10 @@ $cat <<EOM
 Checking to see how well your C compiler handles fd_set and friends ...
 EOM
 $cat >try.c <<EOCP
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #$i_systime I_SYS_TIME
 #$i_sysselct I_SYS_SELECT
 #$d_socket HAS_SOCKET
@@ -10604,6 +12571,177 @@ eval $inlibc
 set getgrent d_getgrent
 eval $inlibc
 
+: see if getgrent_r exists
+set getgrent_r d_getgrent_r
+eval $inlibc
+case "$d_getgrent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "$d_getgrent_r_proto:$usethreads" in
+	":define")	d_getgrent_r_proto=define
+		set d_getgrent_r_proto getgrent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getgrent_r_proto" in
+	define)
+	case "$getgrent_r_proto" in
+	''|0) try='int getgrent_r(struct group*, char*, size_t, struct group**);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBWR ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0) try='int getgrent_r(struct group*, char*, int, struct group**);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBIR ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0) try='struct group* getgrent_r(struct group*, char*, size_t);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=S_SBW ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0) try='struct group* getgrent_r(struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=S_SBI ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0) try='int getgrent_r(struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBI ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0) try='int getgrent_r(struct group*, char*, int, FILE**);'
+	./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBIH ;;
+	esac
+	case "$getgrent_r_proto" in
+	''|0)	d_getgrent_r=undef
+ 	        getgrent_r_proto=0
+		echo "Disabling getgrent_r, cannot determine prototype." >&4 ;;
+	* )	case "$getgrent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getgrent_r_proto="REENTRANT_PROTO_$getgrent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getgrent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getgrent_r=undef
+		getgrent_r_proto=0
+		;;
+	esac
+	;;
+*)	getgrent_r_proto=0
+	;;
+esac
+
+: see if getgrgid_r exists
+set getgrgid_r d_getgrgid_r
+eval $inlibc
+case "$d_getgrgid_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "$d_getgrgid_r_proto:$usethreads" in
+	":define")	d_getgrgid_r_proto=define
+		set d_getgrgid_r_proto getgrgid_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getgrgid_r_proto" in
+	define)
+	case "$getgrgid_r_proto" in
+	''|0) try='int getgrgid_r(gid_t, struct group*, char*, size_t, struct group**);'
+	./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBWR ;;
+	esac
+	case "$getgrgid_r_proto" in
+	''|0) try='int getgrgid_r(gid_t, struct group*, char*, int, struct group**);'
+	./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBIR ;;
+	esac
+	case "$getgrgid_r_proto" in
+	''|0) try='int getgrgid_r(gid_t, struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrgid_r_proto=I_TSBI ;;
+	esac
+	case "$getgrgid_r_proto" in
+	''|0) try='struct group* getgrgid_r(gid_t, struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrgid_r_proto=S_TSBI ;;
+	esac
+	case "$getgrgid_r_proto" in
+	''|0)	d_getgrgid_r=undef
+ 	        getgrgid_r_proto=0
+		echo "Disabling getgrgid_r, cannot determine prototype." >&4 ;;
+	* )	case "$getgrgid_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getgrgid_r_proto="REENTRANT_PROTO_$getgrgid_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getgrgid_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getgrgid_r=undef
+		getgrgid_r_proto=0
+		;;
+	esac
+	;;
+*)	getgrgid_r_proto=0
+	;;
+esac
+
+: see if getgrnam_r exists
+set getgrnam_r d_getgrnam_r
+eval $inlibc
+case "$d_getgrnam_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "$d_getgrnam_r_proto:$usethreads" in
+	":define")	d_getgrnam_r_proto=define
+		set d_getgrnam_r_proto getgrnam_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getgrnam_r_proto" in
+	define)
+	case "$getgrnam_r_proto" in
+	''|0) try='int getgrnam_r(const char*, struct group*, char*, size_t, struct group**);'
+	./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBWR ;;
+	esac
+	case "$getgrnam_r_proto" in
+	''|0) try='int getgrnam_r(const char*, struct group*, char*, int, struct group**);'
+	./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBIR ;;
+	esac
+	case "$getgrnam_r_proto" in
+	''|0) try='struct group* getgrnam_r(const char*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrnam_r_proto=S_CBI ;;
+	esac
+	case "$getgrnam_r_proto" in
+	''|0) try='int getgrnam_r(const char*, struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrnam_r_proto=I_CSBI ;;
+	esac
+	case "$getgrnam_r_proto" in
+	''|0) try='struct group* getgrnam_r(const char*, struct group*, char*, int);'
+	./protochk "extern $try" $hdrs && getgrnam_r_proto=S_CSBI ;;
+	esac
+	case "$getgrnam_r_proto" in
+	''|0)	d_getgrnam_r=undef
+ 	        getgrnam_r_proto=0
+		echo "Disabling getgrnam_r, cannot determine prototype." >&4 ;;
+	* )	case "$getgrnam_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getgrnam_r_proto="REENTRANT_PROTO_$getgrnam_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getgrnam_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getgrnam_r=undef
+		getgrnam_r_proto=0
+		;;
+	esac
+	;;
+*)	getgrnam_r_proto=0
+	;;
+esac
+
 : see if gethostbyaddr exists
 set gethostbyaddr d_gethbyaddr
 eval $inlibc
@@ -10701,9 +12839,196 @@ case "$d_phostname" in
 '') d_phostname="$undef";;
 esac
 
-: see if this is a netdb.h system
-set netdb.h i_netdb
-eval $inhdr
+: see if gethostbyaddr_r exists
+set gethostbyaddr_r d_gethostbyaddr_r
+eval $inlibc
+case "$d_gethostbyaddr_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_gethostbyaddr_r_proto:$usethreads" in
+	":define")	d_gethostbyaddr_r_proto=define
+		set d_gethostbyaddr_r_proto gethostbyaddr_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_gethostbyaddr_r_proto" in
+	define)
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='int gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, size_t, struct hostent**, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CWISBWRE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, size_t, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CWISBWIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const char*, size_t, int, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CWISBIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const void*, size_t, int, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_TWISBIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const char*, int, int, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CIISBIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const char*, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_CSBIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='struct hostent* gethostbyaddr_r(const void*, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=S_TSBIE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='int gethostbyaddr_r(const char*, size_t, int, struct hostent*, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CWISD ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='int gethostbyaddr_r(const char*, int, int, struct hostent*, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CIISD ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='int gethostbyaddr_r(const char*, int, int);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CII ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0) try='int gethostbyaddr_r(const void*, socklen_t, int, struct hostent*, char*, size_t, struct hostent**, int*);'
+	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_TsISBWRE ;;
+	esac
+	case "$gethostbyaddr_r_proto" in
+	''|0)	d_gethostbyaddr_r=undef
+ 	        gethostbyaddr_r_proto=0
+		echo "Disabling gethostbyaddr_r, cannot determine prototype." >&4 ;;
+	* )	case "$gethostbyaddr_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) gethostbyaddr_r_proto="REENTRANT_PROTO_$gethostbyaddr_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "gethostbyaddr_r has no prototype, not using it." >&4 ;;
+		esac
+		d_gethostbyaddr_r=undef
+		gethostbyaddr_r_proto=0
+		;;
+	esac
+	;;
+*)	gethostbyaddr_r_proto=0
+	;;
+esac
+
+: see if gethostbyname_r exists
+set gethostbyname_r d_gethostbyname_r
+eval $inlibc
+case "$d_gethostbyname_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_gethostbyname_r_proto:$usethreads" in
+	":define")	d_gethostbyname_r_proto=define
+		set d_gethostbyname_r_proto gethostbyname_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_gethostbyname_r_proto" in
+	define)
+	case "$gethostbyname_r_proto" in
+	''|0) try='int gethostbyname_r(const char*, struct hostent*, char*, size_t, struct hostent**, int*);'
+	./protochk "extern $try" $hdrs && gethostbyname_r_proto=I_CSBWRE ;;
+	esac
+	case "$gethostbyname_r_proto" in
+	''|0) try='struct hostent* gethostbyname_r(const char*, struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostbyname_r_proto=S_CSBIE ;;
+	esac
+	case "$gethostbyname_r_proto" in
+	''|0) try='int gethostbyname_r(const char*, struct hostent*, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && gethostbyname_r_proto=I_CSD ;;
+	esac
+	case "$gethostbyname_r_proto" in
+	''|0)	d_gethostbyname_r=undef
+ 	        gethostbyname_r_proto=0
+		echo "Disabling gethostbyname_r, cannot determine prototype." >&4 ;;
+	* )	case "$gethostbyname_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) gethostbyname_r_proto="REENTRANT_PROTO_$gethostbyname_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "gethostbyname_r has no prototype, not using it." >&4 ;;
+		esac
+		d_gethostbyname_r=undef
+		gethostbyname_r_proto=0
+		;;
+	esac
+	;;
+*)	gethostbyname_r_proto=0
+	;;
+esac
+
+: see if gethostent_r exists
+set gethostent_r d_gethostent_r
+eval $inlibc
+case "$d_gethostent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_gethostent_r_proto:$usethreads" in
+	":define")	d_gethostent_r_proto=define
+		set d_gethostent_r_proto gethostent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_gethostent_r_proto" in
+	define)
+	case "$gethostent_r_proto" in
+	''|0) try='int gethostent_r(struct hostent*, char*, size_t, struct hostent**, int*);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBWRE ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0) try='int gethostent_r(struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBIE ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0) try='struct hostent* gethostent_r(struct hostent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=S_SBIE ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0) try='struct hostent* gethostent_r(struct hostent*, char*, int);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=S_SBI ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0) try='int gethostent_r(struct hostent*, char*, int);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=I_SBI ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0) try='int gethostent_r(struct hostent*, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && gethostent_r_proto=I_SD ;;
+	esac
+	case "$gethostent_r_proto" in
+	''|0)	d_gethostent_r=undef
+ 	        gethostent_r_proto=0
+		echo "Disabling gethostent_r, cannot determine prototype." >&4 ;;
+	* )	case "$gethostent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) gethostent_r_proto="REENTRANT_PROTO_$gethostent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "gethostent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_gethostent_r=undef
+		gethostent_r_proto=0
+		;;
+	esac
+	;;
+*)	gethostent_r_proto=0
+	;;
+esac
 
 : see if prototypes for various gethostxxx netdb.h functions are available
 echo " "
@@ -10718,6 +13043,59 @@ eval $inlibc
 set getlogin d_getlogin
 eval $inlibc
 
+: see if getlogin_r exists
+set getlogin_r d_getlogin_r
+eval $inlibc
+case "$d_getlogin_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_unistd unistd.h"
+	case "$d_getlogin_r_proto:$usethreads" in
+	":define")	d_getlogin_r_proto=define
+		set d_getlogin_r_proto getlogin_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getlogin_r_proto" in
+	define)
+	case "$getlogin_r_proto" in
+	''|0) try='int getlogin_r(char*, size_t);'
+	./protochk "extern $try" $hdrs && getlogin_r_proto=I_BW ;;
+	esac
+	case "$getlogin_r_proto" in
+	''|0) try='int getlogin_r(char*, int);'
+	./protochk "extern $try" $hdrs && getlogin_r_proto=I_BI ;;
+	esac
+	case "$getlogin_r_proto" in
+	''|0) try='char* getlogin_r(char*, size_t);'
+	./protochk "extern $try" $hdrs && getlogin_r_proto=B_BW ;;
+	esac
+	case "$getlogin_r_proto" in
+	''|0) try='char* getlogin_r(char*, int);'
+	./protochk "extern $try" $hdrs && getlogin_r_proto=B_BI ;;
+	esac
+	case "$getlogin_r_proto" in
+	''|0)	d_getlogin_r=undef
+ 	        getlogin_r_proto=0
+		echo "Disabling getlogin_r, cannot determine prototype." >&4 ;;
+	* )	case "$getlogin_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getlogin_r_proto="REENTRANT_PROTO_$getlogin_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getlogin_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getlogin_r=undef
+		getlogin_r_proto=0
+		;;
+	esac
+	;;
+*)	getlogin_r_proto=0
+	;;
+esac
+
 : see if getmnt exists
 set getmnt d_getmnt
 eval $inlibc
@@ -10738,6 +13116,189 @@ eval $inlibc
 set getnetent d_getnent
 eval $inlibc
 
+: see if getnetbyaddr_r exists
+set getnetbyaddr_r d_getnetbyaddr_r
+eval $inlibc
+case "$d_getnetbyaddr_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getnetbyaddr_r_proto:$usethreads" in
+	":define")	d_getnetbyaddr_r_proto=define
+		set d_getnetbyaddr_r_proto getnetbyaddr_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getnetbyaddr_r_proto" in
+	define)
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(unsigned long, int, struct netent*, char*, size_t, struct netent**, int*);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_UISBWRE ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(long, int, struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_LISBI ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='struct netent* getnetbyaddr_r(in_addr_t, int, struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=S_TISBI ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='struct netent* getnetbyaddr_r(long, int, struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=S_LISBI ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(in_addr_t, int, struct netent*, struct netent_data*);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_TISD ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(long, int, struct netent*, struct netent_data*);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_LISD ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(int, int, struct netent*, struct netent_data*);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_IISD ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0) try='int getnetbyaddr_r(uint32_t, int, struct netent*, char*, size_t, struct netent**, int*);'
+	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_uISBWRE ;;
+	esac
+	case "$getnetbyaddr_r_proto" in
+	''|0)	d_getnetbyaddr_r=undef
+ 	        getnetbyaddr_r_proto=0
+		echo "Disabling getnetbyaddr_r, cannot determine prototype." >&4 ;;
+	* )	case "$getnetbyaddr_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getnetbyaddr_r_proto="REENTRANT_PROTO_$getnetbyaddr_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getnetbyaddr_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getnetbyaddr_r=undef
+		getnetbyaddr_r_proto=0
+		;;
+	esac
+	;;
+*)	getnetbyaddr_r_proto=0
+	;;
+esac
+
+: see if getnetbyname_r exists
+set getnetbyname_r d_getnetbyname_r
+eval $inlibc
+case "$d_getnetbyname_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getnetbyname_r_proto:$usethreads" in
+	":define")	d_getnetbyname_r_proto=define
+		set d_getnetbyname_r_proto getnetbyname_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getnetbyname_r_proto" in
+	define)
+	case "$getnetbyname_r_proto" in
+	''|0) try='int getnetbyname_r(const char*, struct netent*, char*, size_t, struct netent**, int*);'
+	./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSBWRE ;;
+	esac
+	case "$getnetbyname_r_proto" in
+	''|0) try='int getnetbyname_r(const char*, struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSBI ;;
+	esac
+	case "$getnetbyname_r_proto" in
+	''|0) try='struct netent* getnetbyname_r(const char*, struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetbyname_r_proto=S_CSBI ;;
+	esac
+	case "$getnetbyname_r_proto" in
+	''|0) try='int getnetbyname_r(const char*, struct netent*, struct netent_data*);'
+	./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSD ;;
+	esac
+	case "$getnetbyname_r_proto" in
+	''|0)	d_getnetbyname_r=undef
+ 	        getnetbyname_r_proto=0
+		echo "Disabling getnetbyname_r, cannot determine prototype." >&4 ;;
+	* )	case "$getnetbyname_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getnetbyname_r_proto="REENTRANT_PROTO_$getnetbyname_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getnetbyname_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getnetbyname_r=undef
+		getnetbyname_r_proto=0
+		;;
+	esac
+	;;
+*)	getnetbyname_r_proto=0
+	;;
+esac
+
+: see if getnetent_r exists
+set getnetent_r d_getnetent_r
+eval $inlibc
+case "$d_getnetent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getnetent_r_proto:$usethreads" in
+	":define")	d_getnetent_r_proto=define
+		set d_getnetent_r_proto getnetent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getnetent_r_proto" in
+	define)
+	case "$getnetent_r_proto" in
+	''|0) try='int getnetent_r(struct netent*, char*, size_t, struct netent**, int*);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBWRE ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0) try='int getnetent_r(struct netent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBIE ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0) try='struct netent* getnetent_r(struct netent*, char*, int, int*);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=S_SBIE ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0) try='struct netent* getnetent_r(struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=S_SBI ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0) try='int getnetent_r(struct netent*, char*, int);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=I_SBI ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0) try='int getnetent_r(struct netent*, struct netent_data*);'
+	./protochk "extern $try" $hdrs && getnetent_r_proto=I_SD ;;
+	esac
+	case "$getnetent_r_proto" in
+	''|0)	d_getnetent_r=undef
+ 	        getnetent_r_proto=0
+		echo "Disabling getnetent_r, cannot determine prototype." >&4 ;;
+	* )	case "$getnetent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getnetent_r_proto="REENTRANT_PROTO_$getnetent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getnetent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getnetent_r=undef
+		getnetent_r_proto=0
+		;;
+	esac
+	;;
+*)	getnetent_r_proto=0
+	;;
+esac
+
 : see if prototypes for various getnetxxx netdb.h functions are available
 echo " "
 set d_getnetprotos getnetent $i_netdb netdb.h
@@ -10772,9 +13333,160 @@ eval $inlibc
 set getppid d_getppid
 eval $inlibc
 
-: see if getpriority exists
-set getpriority d_getprior
+: see if getpriority exists
+set getpriority d_getprior
+eval $inlibc
+
+: see if getprotobyname_r exists
+set getprotobyname_r d_getprotobyname_r
+eval $inlibc
+case "$d_getprotobyname_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getprotobyname_r_proto:$usethreads" in
+	":define")	d_getprotobyname_r_proto=define
+		set d_getprotobyname_r_proto getprotobyname_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getprotobyname_r_proto" in
+	define)
+	case "$getprotobyname_r_proto" in
+	''|0) try='int getprotobyname_r(const char*, struct protoent*, char*, size_t, struct protoent**);'
+	./protochk "extern $try" $hdrs && getprotobyname_r_proto=I_CSBWR ;;
+	esac
+	case "$getprotobyname_r_proto" in
+	''|0) try='struct protoent* getprotobyname_r(const char*, struct protoent*, char*, int);'
+	./protochk "extern $try" $hdrs && getprotobyname_r_proto=S_CSBI ;;
+	esac
+	case "$getprotobyname_r_proto" in
+	''|0) try='int getprotobyname_r(const char*, struct protoent*, struct protoent_data*);'
+	./protochk "extern $try" $hdrs && getprotobyname_r_proto=I_CSD ;;
+	esac
+	case "$getprotobyname_r_proto" in
+	''|0)	d_getprotobyname_r=undef
+ 	        getprotobyname_r_proto=0
+		echo "Disabling getprotobyname_r, cannot determine prototype." >&4 ;;
+	* )	case "$getprotobyname_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getprotobyname_r_proto="REENTRANT_PROTO_$getprotobyname_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getprotobyname_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getprotobyname_r=undef
+		getprotobyname_r_proto=0
+		;;
+	esac
+	;;
+*)	getprotobyname_r_proto=0
+	;;
+esac
+
+: see if getprotobynumber_r exists
+set getprotobynumber_r d_getprotobynumber_r
+eval $inlibc
+case "$d_getprotobynumber_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getprotobynumber_r_proto:$usethreads" in
+	":define")	d_getprotobynumber_r_proto=define
+		set d_getprotobynumber_r_proto getprotobynumber_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getprotobynumber_r_proto" in
+	define)
+	case "$getprotobynumber_r_proto" in
+	''|0) try='int getprotobynumber_r(int, struct protoent*, char*, size_t, struct protoent**);'
+	./protochk "extern $try" $hdrs && getprotobynumber_r_proto=I_ISBWR ;;
+	esac
+	case "$getprotobynumber_r_proto" in
+	''|0) try='struct protoent* getprotobynumber_r(int, struct protoent*, char*, int);'
+	./protochk "extern $try" $hdrs && getprotobynumber_r_proto=S_ISBI ;;
+	esac
+	case "$getprotobynumber_r_proto" in
+	''|0) try='int getprotobynumber_r(int, struct protoent*, struct protoent_data*);'
+	./protochk "extern $try" $hdrs && getprotobynumber_r_proto=I_ISD ;;
+	esac
+	case "$getprotobynumber_r_proto" in
+	''|0)	d_getprotobynumber_r=undef
+ 	        getprotobynumber_r_proto=0
+		echo "Disabling getprotobynumber_r, cannot determine prototype." >&4 ;;
+	* )	case "$getprotobynumber_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getprotobynumber_r_proto="REENTRANT_PROTO_$getprotobynumber_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getprotobynumber_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getprotobynumber_r=undef
+		getprotobynumber_r_proto=0
+		;;
+	esac
+	;;
+*)	getprotobynumber_r_proto=0
+	;;
+esac
+
+: see if getprotoent_r exists
+set getprotoent_r d_getprotoent_r
 eval $inlibc
+case "$d_getprotoent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getprotoent_r_proto:$usethreads" in
+	":define")	d_getprotoent_r_proto=define
+		set d_getprotoent_r_proto getprotoent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getprotoent_r_proto" in
+	define)
+	case "$getprotoent_r_proto" in
+	''|0) try='int getprotoent_r(struct protoent*, char*, size_t, struct protoent**);'
+	./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SBWR ;;
+	esac
+	case "$getprotoent_r_proto" in
+	''|0) try='int getprotoent_r(struct protoent*, char*, int);'
+	./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SBI ;;
+	esac
+	case "$getprotoent_r_proto" in
+	''|0) try='struct protoent* getprotoent_r(struct protoent*, char*, int);'
+	./protochk "extern $try" $hdrs && getprotoent_r_proto=S_SBI ;;
+	esac
+	case "$getprotoent_r_proto" in
+	''|0) try='int getprotoent_r(struct protoent*, struct protoent_data*);'
+	./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SD ;;
+	esac
+	case "$getprotoent_r_proto" in
+	''|0)	d_getprotoent_r=undef
+ 	        getprotoent_r_proto=0
+		echo "Disabling getprotoent_r, cannot determine prototype." >&4 ;;
+	* )	case "$getprotoent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getprotoent_r_proto="REENTRANT_PROTO_$getprotoent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getprotoent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getprotoent_r=undef
+		getprotoent_r_proto=0
+		;;
+	esac
+	;;
+*)	getprotoent_r_proto=0
+	;;
+esac
 
 : see if prototypes for various getprotoxxx netdb.h functions are available
 echo " "
@@ -10789,6 +13501,173 @@ eval $inlibc
 set getpwent d_getpwent
 eval $inlibc
 
+: see if getpwent_r exists
+set getpwent_r d_getpwent_r
+eval $inlibc
+case "$d_getpwent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "$d_getpwent_r_proto:$usethreads" in
+	":define")	d_getpwent_r_proto=define
+		set d_getpwent_r_proto getpwent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getpwent_r_proto" in
+	define)
+	case "$getpwent_r_proto" in
+	''|0) try='int getpwent_r(struct passwd*, char*, size_t, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBWR ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0) try='int getpwent_r(struct passwd*, char*, int, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBIR ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0) try='struct passwd* getpwent_r(struct passwd*, char*, size_t);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=S_SBW ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0) try='struct passwd* getpwent_r(struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=S_SBI ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0) try='int getpwent_r(struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBI ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0) try='int getpwent_r(struct passwd*, char*, int, FILE**);'
+	./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBIH ;;
+	esac
+	case "$getpwent_r_proto" in
+	''|0)	d_getpwent_r=undef
+ 	        getpwent_r_proto=0
+		echo "Disabling getpwent_r, cannot determine prototype." >&4 ;;
+	* )	case "$getpwent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getpwent_r_proto="REENTRANT_PROTO_$getpwent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getpwent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getpwent_r=undef
+		getpwent_r_proto=0
+		;;
+	esac
+	;;
+*)	getpwent_r_proto=0
+	;;
+esac
+
+: see if getpwnam_r exists
+set getpwnam_r d_getpwnam_r
+eval $inlibc
+case "$d_getpwnam_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "$d_getpwnam_r_proto:$usethreads" in
+	":define")	d_getpwnam_r_proto=define
+		set d_getpwnam_r_proto getpwnam_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getpwnam_r_proto" in
+	define)
+	case "$getpwnam_r_proto" in
+	''|0) try='int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBWR ;;
+	esac
+	case "$getpwnam_r_proto" in
+	''|0) try='int getpwnam_r(const char*, struct passwd*, char*, int, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBIR ;;
+	esac
+	case "$getpwnam_r_proto" in
+	''|0) try='struct passwd* getpwnam_r(const char*, struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwnam_r_proto=S_CSBI ;;
+	esac
+	case "$getpwnam_r_proto" in
+	''|0) try='int getpwnam_r(const char*, struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBI ;;
+	esac
+	case "$getpwnam_r_proto" in
+	''|0)	d_getpwnam_r=undef
+ 	        getpwnam_r_proto=0
+		echo "Disabling getpwnam_r, cannot determine prototype." >&4 ;;
+	* )	case "$getpwnam_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getpwnam_r_proto="REENTRANT_PROTO_$getpwnam_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getpwnam_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getpwnam_r=undef
+		getpwnam_r_proto=0
+		;;
+	esac
+	;;
+*)	getpwnam_r_proto=0
+	;;
+esac
+
+: see if getpwuid_r exists
+set getpwuid_r d_getpwuid_r
+eval $inlibc
+case "$d_getpwuid_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "$d_getpwuid_r_proto:$usethreads" in
+	":define")	d_getpwuid_r_proto=define
+		set d_getpwuid_r_proto getpwuid_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getpwuid_r_proto" in
+	define)
+	case "$getpwuid_r_proto" in
+	''|0) try='int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBWR ;;
+	esac
+	case "$getpwuid_r_proto" in
+	''|0) try='int getpwuid_r(uid_t, struct passwd*, char*, int, struct passwd**);'
+	./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBIR ;;
+	esac
+	case "$getpwuid_r_proto" in
+	''|0) try='int getpwuid_r(uid_t, struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwuid_r_proto=I_TSBI ;;
+	esac
+	case "$getpwuid_r_proto" in
+	''|0) try='struct passwd* getpwuid_r(uid_t, struct passwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getpwuid_r_proto=S_TSBI ;;
+	esac
+	case "$getpwuid_r_proto" in
+	''|0)	d_getpwuid_r=undef
+ 	        getpwuid_r_proto=0
+		echo "Disabling getpwuid_r, cannot determine prototype." >&4 ;;
+	* )	case "$getpwuid_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getpwuid_r_proto="REENTRANT_PROTO_$getpwuid_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getpwuid_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getpwuid_r=undef
+		getpwuid_r_proto=0
+		;;
+	esac
+	;;
+*)	getpwuid_r_proto=0
+	;;
+esac
+
 
 : see if getservbyname exists
 set getservbyname d_getsbyname
@@ -10802,6 +13681,157 @@ eval $inlibc
 set getservent d_getsent
 eval $inlibc
 
+: see if getservbyname_r exists
+set getservbyname_r d_getservbyname_r
+eval $inlibc
+case "$d_getservbyname_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getservbyname_r_proto:$usethreads" in
+	":define")	d_getservbyname_r_proto=define
+		set d_getservbyname_r_proto getservbyname_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getservbyname_r_proto" in
+	define)
+	case "$getservbyname_r_proto" in
+	''|0) try='int getservbyname_r(const char*, const char*, struct servent*, char*, size_t, struct servent**);'
+	./protochk "extern $try" $hdrs && getservbyname_r_proto=I_CCSBWR ;;
+	esac
+	case "$getservbyname_r_proto" in
+	''|0) try='struct servent* getservbyname_r(const char*, const char*, struct servent*, char*, int);'
+	./protochk "extern $try" $hdrs && getservbyname_r_proto=S_CCSBI ;;
+	esac
+	case "$getservbyname_r_proto" in
+	''|0) try='int getservbyname_r(const char*, const char*, struct servent*, struct servent_data*);'
+	./protochk "extern $try" $hdrs && getservbyname_r_proto=I_CCSD ;;
+	esac
+	case "$getservbyname_r_proto" in
+	''|0)	d_getservbyname_r=undef
+ 	        getservbyname_r_proto=0
+		echo "Disabling getservbyname_r, cannot determine prototype." >&4 ;;
+	* )	case "$getservbyname_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getservbyname_r_proto="REENTRANT_PROTO_$getservbyname_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getservbyname_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getservbyname_r=undef
+		getservbyname_r_proto=0
+		;;
+	esac
+	;;
+*)	getservbyname_r_proto=0
+	;;
+esac
+
+: see if getservbyport_r exists
+set getservbyport_r d_getservbyport_r
+eval $inlibc
+case "$d_getservbyport_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getservbyport_r_proto:$usethreads" in
+	":define")	d_getservbyport_r_proto=define
+		set d_getservbyport_r_proto getservbyport_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getservbyport_r_proto" in
+	define)
+	case "$getservbyport_r_proto" in
+	''|0) try='int getservbyport_r(int, const char*, struct servent*, char*, size_t, struct servent**);'
+	./protochk "extern $try" $hdrs && getservbyport_r_proto=I_ICSBWR ;;
+	esac
+	case "$getservbyport_r_proto" in
+	''|0) try='struct servent* getservbyport_r(int, const char*, struct servent*, char*, int);'
+	./protochk "extern $try" $hdrs && getservbyport_r_proto=S_ICSBI ;;
+	esac
+	case "$getservbyport_r_proto" in
+	''|0) try='int getservbyport_r(int, const char*, struct servent*, struct servent_data*);'
+	./protochk "extern $try" $hdrs && getservbyport_r_proto=I_ICSD ;;
+	esac
+	case "$getservbyport_r_proto" in
+	''|0)	d_getservbyport_r=undef
+ 	        getservbyport_r_proto=0
+		echo "Disabling getservbyport_r, cannot determine prototype." >&4 ;;
+	* )	case "$getservbyport_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getservbyport_r_proto="REENTRANT_PROTO_$getservbyport_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getservbyport_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getservbyport_r=undef
+		getservbyport_r_proto=0
+		;;
+	esac
+	;;
+*)	getservbyport_r_proto=0
+	;;
+esac
+
+: see if getservent_r exists
+set getservent_r d_getservent_r
+eval $inlibc
+case "$d_getservent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_getservent_r_proto:$usethreads" in
+	":define")	d_getservent_r_proto=define
+		set d_getservent_r_proto getservent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getservent_r_proto" in
+	define)
+	case "$getservent_r_proto" in
+	''|0) try='int getservent_r(struct servent*, char*, size_t, struct servent**);'
+	./protochk "extern $try" $hdrs && getservent_r_proto=I_SBWR ;;
+	esac
+	case "$getservent_r_proto" in
+	''|0) try='int getservent_r(struct servent*, char*, int);'
+	./protochk "extern $try" $hdrs && getservent_r_proto=I_SBI ;;
+	esac
+	case "$getservent_r_proto" in
+	''|0) try='struct servent* getservent_r(struct servent*, char*, int);'
+	./protochk "extern $try" $hdrs && getservent_r_proto=S_SBI ;;
+	esac
+	case "$getservent_r_proto" in
+	''|0) try='int getservent_r(struct servent*, struct servent_data*);'
+	./protochk "extern $try" $hdrs && getservent_r_proto=I_SD ;;
+	esac
+	case "$getservent_r_proto" in
+	''|0)	d_getservent_r=undef
+ 	        getservent_r_proto=0
+		echo "Disabling getservent_r, cannot determine prototype." >&4 ;;
+	* )	case "$getservent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getservent_r_proto="REENTRANT_PROTO_$getservent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getservent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getservent_r=undef
+		getservent_r_proto=0
+		;;
+	esac
+	;;
+*)	getservent_r_proto=0
+	;;
+esac
+
 : see if prototypes for various getservxxx netdb.h functions are available
 echo " "
 set d_getservprotos getservent $i_netdb netdb.h
@@ -10811,6 +13841,55 @@ eval $hasproto
 set getspnam d_getspnam
 eval $inlibc
 
+: see if this is a shadow.h system
+set shadow.h i_shadow
+eval $inhdr
+
+: see if getspnam_r exists
+set getspnam_r d_getspnam_r
+eval $inlibc
+case "$d_getspnam_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_shadow shadow.h"
+	case "$d_getspnam_r_proto:$usethreads" in
+	":define")	d_getspnam_r_proto=define
+		set d_getspnam_r_proto getspnam_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_getspnam_r_proto" in
+	define)
+	case "$getspnam_r_proto" in
+	''|0) try='int getspnam_r(const char*, struct spwd*, char*, size_t, struct spwd**);'
+	./protochk "extern $try" $hdrs && getspnam_r_proto=I_CSBWR ;;
+	esac
+	case "$getspnam_r_proto" in
+	''|0) try='struct spwd* getspnam_r(const char*, struct spwd*, char*, int);'
+	./protochk "extern $try" $hdrs && getspnam_r_proto=S_CSBI ;;
+	esac
+	case "$getspnam_r_proto" in
+	''|0)	d_getspnam_r=undef
+ 	        getspnam_r_proto=0
+		echo "Disabling getspnam_r, cannot determine prototype." >&4 ;;
+	* )	case "$getspnam_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) getspnam_r_proto="REENTRANT_PROTO_$getspnam_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "getspnam_r has no prototype, not using it." >&4 ;;
+		esac
+		d_getspnam_r=undef
+		getspnam_r_proto=0
+		;;
+	esac
+	;;
+*)	getspnam_r_proto=0
+	;;
+esac
+
 : see if gettimeofday or ftime exists
 set gettimeofday d_gettimeod
 eval $inlibc
@@ -10830,28 +13909,48 @@ case "$d_gettimeod$d_ftime" in
 	;;
 esac
 
-: see if this is an grp system
-set grp.h i_grp
-eval $inhdr
-
-case "$i_grp" in
-$define)
-	xxx=`./findhdr grp.h`
-	$cppstdin $cppflags $cppminus < $xxx >$$.h
-
-	if $contains 'gr_passwd' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_grpasswd
-	eval $setvar
-
-	$rm -f $$.h
+: see if gmtime_r exists
+set gmtime_r d_gmtime_r
+eval $inlibc
+case "$d_gmtime_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h $i_systime sys/time.h"
+	case "$d_gmtime_r_proto:$usethreads" in
+	":define")	d_gmtime_r_proto=define
+		set d_gmtime_r_proto gmtime_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_gmtime_r_proto" in
+	define)
+	case "$gmtime_r_proto" in
+	''|0) try='struct tm* gmtime_r(const time_t*, struct tm*);'
+	./protochk "extern $try" $hdrs && gmtime_r_proto=S_TS ;;
+	esac
+	case "$gmtime_r_proto" in
+	''|0) try='int gmtime_r(const time_t*, struct tm*);'
+	./protochk "extern $try" $hdrs && gmtime_r_proto=I_TS ;;
+	esac
+	case "$gmtime_r_proto" in
+	''|0)	d_gmtime_r=undef
+ 	        gmtime_r_proto=0
+		echo "Disabling gmtime_r, cannot determine prototype." >&4 ;;
+	* )	case "$gmtime_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) gmtime_r_proto="REENTRANT_PROTO_$gmtime_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
 	;;
-*)
-	val="$undef";
-	set d_grpasswd; eval $setvar
+	*)	case "$usethreads" in
+		define) echo "gmtime_r has no prototype, not using it." >&4 ;;
+		esac
+		d_gmtime_r=undef
+		gmtime_r_proto=0
+		;;
+	esac
+	;;
+*)	gmtime_r_proto=0
 	;;
 esac
 
@@ -10905,6 +14004,10 @@ esac
 set d_htonl
 eval $setvar
 
+: see if ilogbl exists
+set ilogbl d_ilogbl
+eval $inlibc
+
 : index or strchr
 echo " "
 if set index val -f; eval $csym; $val; then
@@ -10944,9 +14047,13 @@ eval $inlibc
 
 : Look for isascii
 echo " "
-$cat >isascii.c <<'EOCP'
+$cat >isascii.c <<EOCP
 #include <stdio.h>
 #include <ctype.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
 	int c = 'A';
 	if (isascii(c))
@@ -11046,10 +14153,87 @@ $rm -f ldbl_dig.?
 set d_ldbl_dig
 eval $setvar
 
+: see if this is a math.h system
+set math.h i_math
+eval $inhdr
+
+d_libm_lib_version="$undef"
+case $i_math in
+    $define)
+	: check to see if math.h defines _LIB_VERSION
+	echo " "
+	echo "Checking to see if your libm supports _LIB_VERSION..." >&4
+	$cat >try.c <<EOCP
+#include <unistd.h>
+#include <math.h>
+int main (int argc, char *argv[])
+{
+    printf ("%d\n", _LIB_VERSION);
+    return (0);
+    } /* main */
+EOCP
+	set try
+	if eval $compile; then
+	    foo=`$run ./try`
+	    echo "Yes, it does ($foo)" >&4
+	    d_libm_lib_version="$define"
+	else
+	    echo "No, it does not (probably harmless)\n" >&4
+	    fi
+	$rm -f try.* try core core.try.*
+	;;
+
+    esac
+
 : see if link exists
 set link d_link
 eval $inlibc
 
+: see if localtime_r exists
+set localtime_r d_localtime_r
+eval $inlibc
+case "$d_localtime_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h $i_systime sys/time.h"
+	case "$d_localtime_r_proto:$usethreads" in
+	":define")	d_localtime_r_proto=define
+		set d_localtime_r_proto localtime_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_localtime_r_proto" in
+	define)
+	case "$localtime_r_proto" in
+	''|0) try='struct tm* localtime_r(const time_t*, struct tm*);'
+	./protochk "extern $try" $hdrs && localtime_r_proto=S_TS ;;
+	esac
+	case "$localtime_r_proto" in
+	''|0) try='int localtime_r(const time_t*, struct tm*);'
+	./protochk "extern $try" $hdrs && localtime_r_proto=I_TS ;;
+	esac
+	case "$localtime_r_proto" in
+	''|0)	d_localtime_r=undef
+ 	        localtime_r_proto=0
+		echo "Disabling localtime_r, cannot determine prototype." >&4 ;;
+	* )	case "$localtime_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) localtime_r_proto="REENTRANT_PROTO_$localtime_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "localtime_r has no prototype, not using it." >&4 ;;
+		esac
+		d_localtime_r=undef
+		localtime_r_proto=0
+		;;
+	esac
+	;;
+*)	localtime_r_proto=0
+	;;
+esac
+
 : see if localeconv exists
 set localeconv d_locconv
 eval $inlibc
@@ -11071,6 +14255,14 @@ eval $inlibc
 set madvise d_madvise
 eval $inlibc
 
+: see if malloc_size exists
+set malloc_size d_malloc_size
+eval $inlibc
+
+: see if malloc_size_good exists
+set malloc_good_size d_malloc_good_size
+eval $inlibc
+
 : see if mblen exists
 set mblen d_mblen
 eval $inlibc
@@ -11146,13 +14338,128 @@ END
 	if $cc $ccflags -c mmap.c >/dev/null 2>&1; then
 		mmaptype='void *'
 	else
-		mmaptype='caddr_t'
+		mmaptype='caddr_t'
+	fi
+	echo "and it returns ($mmaptype)." >&4
+	;;
+esac
+
+
+
+: see if sqrtl exists
+set sqrtl d_sqrtl
+eval $inlibc
+
+: see if scalbnl exists
+set scalbnl d_scalbnl
+eval $inlibc
+
+: see if modfl exists
+set modfl d_modfl
+eval $inlibc
+
+: see if prototype for modfl is available
+echo " "
+set d_modflproto modfl $i_math math.h
+eval $hasproto
+
+d_modfl_pow32_bug="$undef"
+
+case "$d_longdbl$d_modfl" in
+$define$define)
+	$cat <<EOM
+Checking to see whether your modfl() is okay for large values...
+EOM
+$cat >try.c <<EOCP
+#include <math.h> 
+#include <stdio.h>
+EOCP
+if $test "X$d_modflproto" != "X$define"; then
+	$cat >>try.c <<EOCP
+/* Sigh. many current glibcs provide the function, but do not prototype it.  */ 
+long double modfl (long double, long double *);
+EOCP
+fi
+$cat >>try.c <<EOCP
+int main() {
+    long double nv = 4294967303.15;
+    long double v, w;
+    v = modfl(nv, &w);         
+#ifdef __GLIBC__
+    printf("glibc");
+#endif
+    printf(" %"$sPRIfldbl" %"$sPRIfldbl" %"$sPRIfldbl"\n", nv, v, w);
+    return 0;
+}
+EOCP
+	case "$osname:$gccversion" in
+	aix:)	saveccflags="$ccflags"
+		ccflags="$ccflags -qlongdouble" ;; # to avoid core dump
+	esac
+	set try
+	if eval $compile; then
+		foo=`$run ./try`
+		case "$foo" in
+		*" 4294967303.150000 1.150000 4294967302.000000")
+			echo >&4 "Your modfl() is broken for large values."
+			d_modfl_pow32_bug="$define"
+			case "$foo" in
+			glibc)	echo >&4 "You should upgrade your glibc to at least 2.2.2 to get a fixed modfl()."
+			;;
+			esac
+			;;
+		*" 4294967303.150000 0.150000 4294967303.000000")
+			echo >&4 "Your modfl() seems okay for large values."
+			;;
+		*)	echo >&4 "I don't understand your modfl() at all."
+			d_modfl="$undef"
+			;;
+		esac
+		$rm -f try.* try core core.try.*
+	else
+		echo "I cannot figure out whether your modfl() is okay, assuming it isn't."
+		d_modfl="$undef"
 	fi
-	echo "and it returns ($mmaptype)." >&4
+	case "$osname:$gccversion" in
+	aix:)	ccflags="$saveccflags" ;; # restore
+	esac
 	;;
 esac
 
+if $test "$uselongdouble" = "$define"; then
+    message=""
+    if $test "$d_sqrtl" != "$define"; then
+	message="$message sqrtl"
+    fi
+    if $test "$d_modfl" != "$define"; then
+	if $test "$d_aintl:$d_copysignl" = "$define:$define"; then
+	    echo "You have both aintl and copysignl, so I can emulate modfl."
+	else
+	    message="$message modfl"
+	fi
+    fi
+    if $test "$d_frexpl" != "$define"; then
+	if $test "$d_ilogbl:$d_scalbnl" = "$define:$define"; then
+	    echo "You have both ilogbl and scalbnl, so I can emulate frexpl."
+	else
+	    message="$message frexpl"
+	fi
+    fi
+
+    if $test "$message" != ""; then
+	$cat <<EOM >&4
+
+*** You requested the use of long doubles but you do not seem to have
+*** the following mathematical functions needed for long double support:
+***    $message
+*** Please rerun Configure without -Duselongdouble and/or -Dusemorebits.
+*** Cannot continue, aborting.
+
+EOM
 
+	exit 1
+    fi
+fi
 
 : see if mprotect exists
 set mprotect d_mprotect
@@ -11246,8 +14553,12 @@ echo " "
 case "$charsize" in
 '')
 	echo "Checking to see how big your characters are (hey, you never know)..." >&4
-	$cat >try.c <<'EOCP'
+	$cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main()
 {
     printf("%d\n", (int)sizeof(char));
@@ -11487,6 +14798,10 @@ if test X"$d_volatile" = X"$define"; then
 fi
 $cat <<EOP >try.c
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <sys/types.h>
 #include <signal.h>
 #ifdef SIGFPE
@@ -11526,22 +14841,144 @@ set try
 
 d_nv_preserves_uv="$undef"
 if eval $compile; then
-	d_nv_preserves_uv_bits="`$run ./try`"
+	nv_preserves_uv_bits="`$run ./try`"
 fi
-case "$d_nv_preserves_uv_bits" in
+case "$nv_preserves_uv_bits" in
 \-[1-9]*)	
-	d_nv_preserves_uv_bits=`expr 0 - $d_nv_preserves_uv_bits`
-	$echo "Your NVs can preserve all $d_nv_preserves_uv_bits bits of your UVs."  2>&1
+	nv_preserves_uv_bits=`expr 0 - $nv_preserves_uv_bits`
+	$echo "Your NVs can preserve all $nv_preserves_uv_bits bits of your UVs."  2>&1
 	d_nv_preserves_uv="$define"
 	;;
-[1-9]*)	$echo "Your NVs can preserve only $d_nv_preserves_uv_bits bits of your UVs."  2>&1
+[1-9]*)	$echo "Your NVs can preserve only $nv_preserves_uv_bits bits of your UVs."  2>&1
 	d_nv_preserves_uv="$undef" ;;
 *)	$echo "Can't figure out how many bits your NVs preserve." 2>&1
-	d_nv_preserves_uv_bits="$undef" ;;
+	nv_preserves_uv_bits="$undef" ;;
 esac
 
 $rm -f try.* try
 
+$echo "Checking whether NV 0.0 is all bits zero in memory..." >&4
+: volatile so that the compiler has to store it out to memory.
+if test X"$d_volatile" = X"$define"; then
+	volatile=volatile
+fi
+$cat <<EOP >try.c
+#include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#$i_string I_STRING
+#ifdef I_STRING
+#  include <string.h>
+#else
+#  include <strings.h>
+#endif
+#include <sys/types.h>
+#include <signal.h>
+#ifdef SIGFPE
+$volatile int bletched = 0;
+$signal_t blech(s) int s; { bletched = 1; }
+#endif
+
+int checkit($nvtype d, char *where) {
+    unsigned char *p = (char *)&d;
+    unsigned char *end = p + sizeof(d);
+    int fail = 0;
+
+    while (p < end)
+	fail += *p++;
+
+    if (!fail)
+	return 0;
+
+    p = (char *)&d;
+    printf("No - %s: 0x", where);
+    while (p < end)
+	printf ("%02X", *p++);
+    printf("\n");
+    return 1;
+}
+
+int main(int argc, char **argv) {
+    $nvtype d = 0.0;
+    int fail = 0;
+    fail += checkit(d, "0.0");
+
+    /* The compiler shouldn't be assuming that bletched is 0  */
+    d = bletched;
+
+    fail += checkit(d, "bleched");
+
+#ifdef SIGFPE
+    signal(SIGFPE, blech);
+#endif
+
+    /* Paranoia - the compiler should have no way of knowing that ANSI says
+       that argv[argc] will always be NULL.  Actually, if it did assume this it
+       would be buggy, as this is C and main() can be called from elsewhere in
+       the program.  */
+    d = argv[argc] ? 1 : 0;
+
+    if (d) {
+	printf("Odd argv[argc]=%p, d=%g\n", argv[argc], d);
+    }
+
+    fail += checkit(d, "ternary");
+
+    memset(&d, sizeof(d), argv[argc] ? 1 : 0);
+
+    if (d != 0.0) {
+	printf("No - memset doesn't give 0.0\n");
+	/* This might just blow up:  */
+	printf("(gives %g)\n", d);
+	return 1;
+    }
+    
+#ifdef SIGFPE
+    if (bletched) {
+	printf("No - something bleched\n");
+	return 1;
+    }
+#endif
+    if (fail) {
+      printf("No - %d fail(s)\n", fail);
+      return 1;
+    }
+    printf("Yes\n");
+    return 0;
+}
+EOP
+set try
+
+d_nv_zero_is_allbits_zero="$undef"
+if eval $compile; then
+    xxx="`$run ./try`"
+    case "$?" in
+	0)
+	    case "$xxx" in
+		Yes)  cat >&4 <<EOM
+0.0 is represented as all bits zero in memory
+EOM
+		    d_nv_zero_is_allbits_zero="$define"
+		    ;;
+		*)  cat >&4 <<EOM
+0.0 is not represented as all bits zero in memory
+EOM
+		    d_nv_zero_is_allbits_zero="$undef"
+		    ;;
+	    esac
+	    ;;
+	*)  cat >&4 <<EOM
+0.0 is not represented as all bits zero in memory
+EOM
+	    d_nv_zero_is_allbits_zero="$undef"
+	    ;;
+    esac
+fi
+
+$rm -f try.* try
+
 
 : check for off64_t
 echo " "
@@ -11566,13 +15003,6 @@ $rm -f try.* try
 set d_off64_t
 eval $setvar
 
-: see if POSIX threads are available
-set pthread.h i_pthread
-eval $inhdr
-
-
-
-
 : how to create joinable pthreads
 if test "X$usethreads" = "X$define" -a "X$i_pthread" = "X$define"; then
 	echo " "
@@ -11672,8 +15102,36 @@ $rm -f reflect
 set d_procselfexe
 eval $setvar
 
+: see whether the pthread_atfork exists
+$cat >try.c <<EOP
+#include <pthread.h>
+#include <stdio.h>
+int main() {
+#ifdef  PTHREAD_ATFORK
+        pthread_atfork(NULL,NULL,NULL);
+#endif
+}
+EOP
+
 : see if pthread_atfork exists
-set pthread_atfork d_pthread_atfork
+set try -DPTHREAD_ATFORK
+if eval $compile; then
+    val="$define"
+else
+    val="$undef"
+fi
+case "$usethreads" in
+$define)
+        case "$val" in
+        $define) echo 'pthread_atfork found.' >&4        ;;
+        *)       echo 'pthread_atfork NOT found.' >&4    ;;
+        esac
+esac
+set d_pthread_atfork
+eval $setvar
+
+: see if pthread_attr_setscope exists
+set pthread_attr_setscope d_pthread_attr_setscope
 eval $inlibc
 
 
@@ -11710,129 +15168,90 @@ $define)
 	*)	 echo 'sched_yield() NOT found.' >&4	;;
 	esac
 esac
-set d_sched_yield
-eval $setvar
-
-: see if pthread_yield exists
-set try -DPTHREAD_YIELD
-if eval $compile; then
-    val="$define"
-    case "$sched_yield" in
-    '') sched_yield='pthread_yield()' ;;
-    esac
-else
-    set try -DPTHREAD_YIELD_NULL
-    if eval $compile; then
-	val="$define"
-	case "$sched_yield" in
-	'') sched_yield='pthread_yield(NULL)' ;;
-	esac
-    else
-	val="$undef"
-    fi
-fi
-case "$usethreads" in
-$define)
-	case "$val" in
-	$define) echo 'pthread_yield() found.' >&4	;;
-	*)	 echo 'pthread_yield() NOT found.' >&4	;;
-	esac
-	;;
-esac
-set d_pthread_yield
-eval $setvar
-
-case "$sched_yield" in
-'') sched_yield=undef ;;
-esac
-
-$rm -f try try.*
-
-: see if this is a pwd.h system
-set pwd.h i_pwd
-eval $inhdr
-
-case "$i_pwd" in
-$define)
-	xxx=`./findhdr pwd.h`
-	$cppstdin $cppflags $cppminus < $xxx >$$.h
-
-	if $contains 'pw_quota' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwquota
-	eval $setvar
-
-	if $contains 'pw_age' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwage
-	eval $setvar
-
-	if $contains 'pw_change' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwchange
-	eval $setvar
-
-	if $contains 'pw_class' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwclass
-	eval $setvar
-
-	if $contains 'pw_expire' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwexpire
-	eval $setvar
-
-	if $contains 'pw_comment' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwcomment
-	eval $setvar
+set d_sched_yield
+eval $setvar
 
-	if $contains 'pw_gecos' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwgecos
-	eval $setvar
+: see if pthread_yield exists
+set try -DPTHREAD_YIELD
+if eval $compile; then
+    val="$define"
+    case "$sched_yield" in
+    '') sched_yield='pthread_yield()' ;;
+    esac
+else
+    set try -DPTHREAD_YIELD_NULL
+    if eval $compile; then
+	val="$define"
+	case "$sched_yield" in
+	'') sched_yield='pthread_yield(NULL)' ;;
+	esac
+    else
+	val="$undef"
+    fi
+fi
+case "$usethreads" in
+$define)
+	case "$val" in
+	$define) echo 'pthread_yield() found.' >&4	;;
+	*)	 echo 'pthread_yield() NOT found.' >&4	;;
+	esac
+	;;
+esac
+set d_pthread_yield
+eval $setvar
 
-	if $contains 'pw_passwd' $$.h >/dev/null 2>&1; then
-		val="$define"
-	else
-		val="$undef"
-	fi
-	set d_pwpasswd
-	eval $setvar
+case "$sched_yield" in
+'') sched_yield=undef ;;
+esac
 
-	$rm -f $$.h
+$rm -f try try.*
+
+: see if random_r exists
+set random_r d_random_r
+eval $inlibc
+case "$d_random_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "$d_random_r_proto:$usethreads" in
+	":define")	d_random_r_proto=define
+		set d_random_r_proto random_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_random_r_proto" in
+	define)
+	case "$random_r_proto" in
+	''|0) try='int random_r(int*, struct random_data*);'
+	./protochk "extern $try" $hdrs && random_r_proto=I_iS ;;
+	esac
+	case "$random_r_proto" in
+	''|0) try='int random_r(long*, struct random_data*);'
+	./protochk "extern $try" $hdrs && random_r_proto=I_lS ;;
+	esac
+	case "$random_r_proto" in
+	''|0) try='int random_r(struct random_data*, int32_t*);'
+	./protochk "extern $try" $hdrs && random_r_proto=I_St ;;
+	esac
+	case "$random_r_proto" in
+	''|0)	d_random_r=undef
+ 	        random_r_proto=0
+		echo "Disabling random_r, cannot determine prototype." >&4 ;;
+	* )	case "$random_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) random_r_proto="REENTRANT_PROTO_$random_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
 	;;
-*)
-	val="$undef"; 
-	set d_pwquota; eval $setvar
-	set d_pwage; eval $setvar
-	set d_pwchange; eval $setvar
-	set d_pwclass; eval $setvar
-	set d_pwexpire; eval $setvar
-	set d_pwcomment; eval $setvar
-	set d_pwgecos; eval $setvar
-	set d_pwpasswd; eval $setvar
+	*)	case "$usethreads" in
+		define) echo "random_r has no prototype, not using it." >&4 ;;
+		esac
+		d_random_r=undef
+		random_r_proto=0
+		;;
+	esac
+	;;
+*)	random_r_proto=0
 	;;
 esac
 
@@ -11846,6 +15265,96 @@ eval $inlibc
 set rewinddir d_rewinddir
 eval $inlibc
 
+: see if readdir64_r exists
+set readdir64_r d_readdir64_r
+eval $inlibc
+case "$d_readdir64_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_dirent dirent.h"
+	case "$d_readdir64_r_proto:$usethreads" in
+	":define")	d_readdir64_r_proto=define
+		set d_readdir64_r_proto readdir64_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_readdir64_r_proto" in
+	define)
+	case "$readdir64_r_proto" in
+	''|0) try='int readdir64_r(DIR*, struct dirent64*, struct dirent64**);'
+	./protochk "extern $try" $hdrs && readdir64_r_proto=I_TSR ;;
+	esac
+	case "$readdir64_r_proto" in
+	''|0) try='int readdir64_r(DIR*, struct dirent64*);'
+	./protochk "extern $try" $hdrs && readdir64_r_proto=I_TS ;;
+	esac
+	case "$readdir64_r_proto" in
+	''|0)	d_readdir64_r=undef
+ 	        readdir64_r_proto=0
+		echo "Disabling readdir64_r, cannot determine prototype." >&4 ;;
+	* )	case "$readdir64_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) readdir64_r_proto="REENTRANT_PROTO_$readdir64_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "readdir64_r has no prototype, not using it." >&4 ;;
+		esac
+		d_readdir64_r=undef
+		readdir64_r_proto=0
+		;;
+	esac
+	;;
+*)	readdir64_r_proto=0
+	;;
+esac
+
+: see if readdir_r exists
+set readdir_r d_readdir_r
+eval $inlibc
+case "$d_readdir_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_dirent dirent.h"
+	case "$d_readdir_r_proto:$usethreads" in
+	":define")	d_readdir_r_proto=define
+		set d_readdir_r_proto readdir_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_readdir_r_proto" in
+	define)
+	case "$readdir_r_proto" in
+	''|0) try='int readdir_r(DIR*, struct dirent*, struct dirent**);'
+	./protochk "extern $try" $hdrs && readdir_r_proto=I_TSR ;;
+	esac
+	case "$readdir_r_proto" in
+	''|0) try='int readdir_r(DIR*, struct dirent*);'
+	./protochk "extern $try" $hdrs && readdir_r_proto=I_TS ;;
+	esac
+	case "$readdir_r_proto" in
+	''|0)	d_readdir_r=undef
+ 	        readdir_r_proto=0
+		echo "Disabling readdir_r, cannot determine prototype." >&4 ;;
+	* )	case "$readdir_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) readdir_r_proto="REENTRANT_PROTO_$readdir_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "readdir_r has no prototype, not using it." >&4 ;;
+		esac
+		d_readdir_r=undef
+		readdir_r_proto=0
+		;;
+	esac
+	;;
+*)	readdir_r_proto=0
+	;;
+esac
+
 : see if readv exists
 set readv d_readv
 eval $inlibc
@@ -12163,14 +15672,13 @@ else
     echo "You do not have union semun in <sys/sem.h>." >&4
     val="$undef"
 fi
-$rm -f try try.c try.h
+$rm -f try try.c
 set d_union_semun
 eval $setvar
 
 : see how to do semctl IPC_STAT
 case "$d_sem" in
 $define)
-    : see whether semctl IPC_STAT can use union semun
     echo " "
     $cat > try.h <<END
 #ifndef S_IRUSR
@@ -12196,8 +15704,11 @@ $define)
 #   define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH)
 #endif
 END
-
-    $cat > try.c <<END
+    : see whether semctl IPC_STAT can use union semun
+    val="$undef"
+    case "$d_semctl_semun" in
+    '')
+      $cat > try.c <<END
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
@@ -12243,15 +15754,16 @@ int main() {
   return 0;
 }
 END
-    val="$undef"
-    set try
-    if eval $compile; then
-	xxx=`$run ./try`
-        case "$xxx" in
-        semun) val="$define" ;;
-        esac
-    fi
-    $rm -f try try.c
+      set try
+      if eval $compile; then
+	  xxx=`$run ./try`
+          case "$xxx" in
+          semun) val="$define" ;;
+          esac
+      fi
+      $rm -f try try.c
+      ;;
+    esac
     set d_semctl_semun
     eval $setvar
     case "$d_semctl_semun" in
@@ -12265,7 +15777,10 @@ END
     esac
 
     : see whether semctl IPC_STAT can use struct semid_ds pointer
-    $cat > try.c <<'END'
+    val="$undef"
+    case "$d_semctl_semid_ds" in
+    '')
+      $cat > try.c <<'END'
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
@@ -12301,15 +15816,16 @@ int main() {
     return 0;
 }
 END
-    val="$undef"
-    set try
-    if eval $compile; then
-        xxx=`$run ./try`
-        case "$xxx" in
-        semid_ds) val="$define" ;;
-        esac
-    fi
-    $rm -f try try.c
+      set try
+      if eval $compile; then
+          xxx=`$run ./try`
+          case "$xxx" in
+          semid_ds) val="$define" ;;
+          esac
+      fi
+      $rm -f try try.c
+      ;;
+    esac
     set d_semctl_semid_ds
     eval $setvar
     case "$d_semctl_semid_ds" in
@@ -12350,10 +15866,100 @@ eval $inlibc
 set setgrent d_setgrent
 eval $inlibc
 
+: see if setgrent_r exists
+set setgrent_r d_setgrent_r
+eval $inlibc
+case "$d_setgrent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "$d_setgrent_r_proto:$usethreads" in
+	":define")	d_setgrent_r_proto=define
+		set d_setgrent_r_proto setgrent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setgrent_r_proto" in
+	define)
+	case "$setgrent_r_proto" in
+	''|0) try='int setgrent_r(FILE**);'
+	./protochk "extern $try" $hdrs && setgrent_r_proto=I_H ;;
+	esac
+	case "$setgrent_r_proto" in
+	''|0) try='void setgrent_r(FILE**);'
+	./protochk "extern $try" $hdrs && setgrent_r_proto=V_H ;;
+	esac
+	case "$setgrent_r_proto" in
+	''|0)	d_setgrent_r=undef
+ 	        setgrent_r_proto=0
+		echo "Disabling setgrent_r, cannot determine prototype." >&4 ;;
+	* )	case "$setgrent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setgrent_r_proto="REENTRANT_PROTO_$setgrent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setgrent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setgrent_r=undef
+		setgrent_r_proto=0
+		;;
+	esac
+	;;
+*)	setgrent_r_proto=0
+	;;
+esac
+
 : see if sethostent exists
 set sethostent d_sethent
 eval $inlibc
 
+: see if sethostent_r exists
+set sethostent_r d_sethostent_r
+eval $inlibc
+case "$d_sethostent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_sethostent_r_proto:$usethreads" in
+	":define")	d_sethostent_r_proto=define
+		set d_sethostent_r_proto sethostent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_sethostent_r_proto" in
+	define)
+	case "$sethostent_r_proto" in
+	''|0) try='int sethostent_r(int, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && sethostent_r_proto=I_ID ;;
+	esac
+	case "$sethostent_r_proto" in
+	''|0) try='void sethostent_r(int, struct hostent_data*);'
+	./protochk "extern $try" $hdrs && sethostent_r_proto=V_ID ;;
+	esac
+	case "$sethostent_r_proto" in
+	''|0)	d_sethostent_r=undef
+ 	        sethostent_r_proto=0
+		echo "Disabling sethostent_r, cannot determine prototype." >&4 ;;
+	* )	case "$sethostent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) sethostent_r_proto="REENTRANT_PROTO_$sethostent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "sethostent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_sethostent_r=undef
+		sethostent_r_proto=0
+		;;
+	esac
+	;;
+*)	sethostent_r_proto=0
+	;;
+esac
+
 : see if setitimer exists
 set setitimer d_setitimer
 eval $inlibc
@@ -12366,10 +15972,100 @@ eval $inlibc
 set setlocale d_setlocale
 eval $inlibc
 
+: see if locale.h is available
+set locale.h i_locale
+eval $inhdr
+
+: see if setlocale_r exists
+set setlocale_r d_setlocale_r
+eval $inlibc
+case "$d_setlocale_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_locale locale.h"
+	case "$d_setlocale_r_proto:$usethreads" in
+	":define")	d_setlocale_r_proto=define
+		set d_setlocale_r_proto setlocale_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setlocale_r_proto" in
+	define)
+	case "$setlocale_r_proto" in
+	''|0) try='int setlocale_r(int, const char*, char*, int);'
+	./protochk "extern $try" $hdrs && setlocale_r_proto=I_ICBI ;;
+	esac
+	case "$setlocale_r_proto" in
+	''|0)	d_setlocale_r=undef
+ 	        setlocale_r_proto=0
+		echo "Disabling setlocale_r, cannot determine prototype." >&4 ;;
+	* )	case "$setlocale_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setlocale_r_proto="REENTRANT_PROTO_$setlocale_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setlocale_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setlocale_r=undef
+		setlocale_r_proto=0
+		;;
+	esac
+	;;
+*)	setlocale_r_proto=0
+	;;
+esac
+
 : see if setnetent exists
 set setnetent d_setnent
 eval $inlibc
 
+: see if setnetent_r exists
+set setnetent_r d_setnetent_r
+eval $inlibc
+case "$d_setnetent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_setnetent_r_proto:$usethreads" in
+	":define")	d_setnetent_r_proto=define
+		set d_setnetent_r_proto setnetent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setnetent_r_proto" in
+	define)
+	case "$setnetent_r_proto" in
+	''|0) try='int setnetent_r(int, struct netent_data*);'
+	./protochk "extern $try" $hdrs && setnetent_r_proto=I_ID ;;
+	esac
+	case "$setnetent_r_proto" in
+	''|0) try='void setnetent_r(int, struct netent_data*);'
+	./protochk "extern $try" $hdrs && setnetent_r_proto=V_ID ;;
+	esac
+	case "$setnetent_r_proto" in
+	''|0)	d_setnetent_r=undef
+ 	        setnetent_r_proto=0
+		echo "Disabling setnetent_r, cannot determine prototype." >&4 ;;
+	* )	case "$setnetent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setnetent_r_proto="REENTRANT_PROTO_$setnetent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setnetent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setnetent_r=undef
+		setnetent_r_proto=0
+		;;
+	esac
+	;;
+*)	setnetent_r_proto=0
+	;;
+esac
+
 : see if setprotoent exists
 set setprotoent d_setpent
 eval $inlibc
@@ -12390,10 +16086,100 @@ eval $inlibc
 set setproctitle d_setproctitle
 eval $inlibc
 
+: see if setprotoent_r exists
+set setprotoent_r d_setprotoent_r
+eval $inlibc
+case "$d_setprotoent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_setprotoent_r_proto:$usethreads" in
+	":define")	d_setprotoent_r_proto=define
+		set d_setprotoent_r_proto setprotoent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setprotoent_r_proto" in
+	define)
+	case "$setprotoent_r_proto" in
+	''|0) try='int setprotoent_r(int, struct protoent_data*);'
+	./protochk "extern $try" $hdrs && setprotoent_r_proto=I_ID ;;
+	esac
+	case "$setprotoent_r_proto" in
+	''|0) try='void setprotoent_r(int, struct protoent_data*);'
+	./protochk "extern $try" $hdrs && setprotoent_r_proto=V_ID ;;
+	esac
+	case "$setprotoent_r_proto" in
+	''|0)	d_setprotoent_r=undef
+ 	        setprotoent_r_proto=0
+		echo "Disabling setprotoent_r, cannot determine prototype." >&4 ;;
+	* )	case "$setprotoent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setprotoent_r_proto="REENTRANT_PROTO_$setprotoent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setprotoent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setprotoent_r=undef
+		setprotoent_r_proto=0
+		;;
+	esac
+	;;
+*)	setprotoent_r_proto=0
+	;;
+esac
+
 : see if setpwent exists
 set setpwent d_setpwent
 eval $inlibc
 
+: see if setpwent_r exists
+set setpwent_r d_setpwent_r
+eval $inlibc
+case "$d_setpwent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "$d_setpwent_r_proto:$usethreads" in
+	":define")	d_setpwent_r_proto=define
+		set d_setpwent_r_proto setpwent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setpwent_r_proto" in
+	define)
+	case "$setpwent_r_proto" in
+	''|0) try='int setpwent_r(FILE**);'
+	./protochk "extern $try" $hdrs && setpwent_r_proto=I_H ;;
+	esac
+	case "$setpwent_r_proto" in
+	''|0) try='void setpwent_r(FILE**);'
+	./protochk "extern $try" $hdrs && setpwent_r_proto=V_H ;;
+	esac
+	case "$setpwent_r_proto" in
+	''|0)	d_setpwent_r=undef
+ 	        setpwent_r_proto=0
+		echo "Disabling setpwent_r, cannot determine prototype." >&4 ;;
+	* )	case "$setpwent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setpwent_r_proto="REENTRANT_PROTO_$setpwent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setpwent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setpwent_r=undef
+		setpwent_r_proto=0
+		;;
+	esac
+	;;
+*)	setpwent_r_proto=0
+	;;
+esac
+
 : see if setregid exists
 set setregid d_setregid
 eval $inlibc
@@ -12418,6 +16204,51 @@ eval $inlibc
 set setservent d_setsent
 eval $inlibc
 
+: see if setservent_r exists
+set setservent_r d_setservent_r
+eval $inlibc
+case "$d_setservent_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "$d_setservent_r_proto:$usethreads" in
+	":define")	d_setservent_r_proto=define
+		set d_setservent_r_proto setservent_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_setservent_r_proto" in
+	define)
+	case "$setservent_r_proto" in
+	''|0) try='int setservent_r(int, struct servent_data*);'
+	./protochk "extern $try" $hdrs && setservent_r_proto=I_ID ;;
+	esac
+	case "$setservent_r_proto" in
+	''|0) try='void setservent_r(int, struct servent_data*);'
+	./protochk "extern $try" $hdrs && setservent_r_proto=V_ID ;;
+	esac
+	case "$setservent_r_proto" in
+	''|0)	d_setservent_r=undef
+ 	        setservent_r_proto=0
+		echo "Disabling setservent_r, cannot determine prototype." >&4 ;;
+	* )	case "$setservent_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) setservent_r_proto="REENTRANT_PROTO_$setservent_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "setservent_r has no prototype, not using it." >&4 ;;
+		esac
+		d_setservent_r=undef
+		setservent_r_proto=0
+		;;
+	esac
+	;;
+*)	setservent_r_proto=0
+	;;
+esac
+
 : see if setsid exists
 set setsid d_setsid
 eval $inlibc
@@ -12584,10 +16415,14 @@ echo " "
 : see if we have sigaction
 if set sigaction val -f d_sigaction; eval $csym; $val; then
 	echo 'sigaction() found.' >&4
-	$cat > try.c <<'EOP'
+	$cat > try.c <<EOP
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main()
 {
     struct sigaction act, oact;
@@ -12619,8 +16454,12 @@ eval $inlibc
 echo " "
 case "$d_sigsetjmp" in
 '')
-	$cat >try.c <<'EOP'
+	$cat >try.c <<EOP
 #include <setjmp.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 sigjmp_buf env;
 int set = 1;
 int main()
@@ -12669,9 +16508,91 @@ echo " "
 set d_sockatmarkproto sockatmark $d_socket sys/socket.h
 eval $hasproto
 
-: see if socks5_init exists
-set socks5_init d_socks5_init
+: see if socks5_init exists
+set socks5_init d_socks5_init
+eval $inlibc
+
+: see if srand48_r exists
+set srand48_r d_srand48_r
+eval $inlibc
+case "$d_srand48_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "$d_srand48_r_proto:$usethreads" in
+	":define")	d_srand48_r_proto=define
+		set d_srand48_r_proto srand48_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_srand48_r_proto" in
+	define)
+	case "$srand48_r_proto" in
+	''|0) try='int srand48_r(long, struct drand48_data*);'
+	./protochk "extern $try" $hdrs && srand48_r_proto=I_LS ;;
+	esac
+	case "$srand48_r_proto" in
+	''|0)	d_srand48_r=undef
+ 	        srand48_r_proto=0
+		echo "Disabling srand48_r, cannot determine prototype." >&4 ;;
+	* )	case "$srand48_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) srand48_r_proto="REENTRANT_PROTO_$srand48_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "srand48_r has no prototype, not using it." >&4 ;;
+		esac
+		d_srand48_r=undef
+		srand48_r_proto=0
+		;;
+	esac
+	;;
+*)	srand48_r_proto=0
+	;;
+esac
+
+: see if srandom_r exists
+set srandom_r d_srandom_r
 eval $inlibc
+case "$d_srandom_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "$d_srandom_r_proto:$usethreads" in
+	":define")	d_srandom_r_proto=define
+		set d_srandom_r_proto srandom_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_srandom_r_proto" in
+	define)
+	case "$srandom_r_proto" in
+	''|0) try='int srandom_r(unsigned int, struct random_data*);'
+	./protochk "extern $try" $hdrs && srandom_r_proto=I_TS ;;
+	esac
+	case "$srandom_r_proto" in
+	''|0)	d_srandom_r=undef
+ 	        srandom_r_proto=0
+		echo "Disabling srandom_r, cannot determine prototype." >&4 ;;
+	* )	case "$srandom_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) srandom_r_proto="REENTRANT_PROTO_$srandom_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "srandom_r has no prototype, not using it." >&4 ;;
+		esac
+		d_srandom_r=undef
+		srandom_r_proto=0
+		;;
+	esac
+	;;
+*)	srandom_r_proto=0
+	;;
+esac
 
 : see if prototype for setresgid is available
 echo " "
@@ -12725,250 +16646,14 @@ define)
 	eval $hasfield
 	;;
 *)	val="$undef"
-	set d_statfs_f_flags
-	eval $setvar
-	;;
-esac
-case "$d_statfs_f_flags" in
-"$define")      echo "Yes, it does."   ;;
-*)              echo "No, it doesn't." ;;
-esac
-
-: see if _ptr and _cnt from stdio act std
-echo " "
-
-if $contains '_lbfsize' `./findhdr stdio.h` >/dev/null 2>&1 ; then
-	echo "(Looks like you have stdio.h from BSD.)"
-	case "$stdio_ptr" in
-	'') stdio_ptr='((fp)->_p)'
-		ptr_lval=$define
-		;;
-	*)	ptr_lval=$d_stdio_ptr_lval;;
-	esac
-	case "$stdio_cnt" in
-	'') stdio_cnt='((fp)->_r)'
-		cnt_lval=$define
-		;;
-	*)	cnt_lval=$d_stdio_cnt_lval;;
-	esac
-	case "$stdio_base" in
-	'') stdio_base='((fp)->_ub._base ? (fp)->_ub._base : (fp)->_bf._base)';;
-	esac
-	case "$stdio_bufsiz" in
-	'') stdio_bufsiz='((fp)->_ub._base ? (fp)->_ub._size : (fp)->_bf._size)';;
-	esac
-elif $contains '_IO_fpos_t' `./findhdr stdio.h` `./findhdr libio.h` >/dev/null 2>&1 ; then
-	echo "(Looks like you have stdio.h from Linux.)"
-	case "$stdio_ptr" in
-	'') stdio_ptr='((fp)->_IO_read_ptr)'
-		ptr_lval=$define
-		;;
-	*)	ptr_lval=$d_stdio_ptr_lval;;
-	esac
-	case "$stdio_cnt" in
-	'') stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
-		cnt_lval=$undef
-		;;
-	*)	cnt_lval=$d_stdio_cnt_lval;;
-	esac
-	case "$stdio_base" in
-	'') stdio_base='((fp)->_IO_read_base)';;
-	esac
-	case "$stdio_bufsiz" in
-	'') stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)';;
-	esac
-else
-	case "$stdio_ptr" in
-	'') stdio_ptr='((fp)->_ptr)'
-		ptr_lval=$define
-		;;
-	*)	ptr_lval=$d_stdio_ptr_lval;;
-	esac
-	case "$stdio_cnt" in
-	'') stdio_cnt='((fp)->_cnt)'
-		cnt_lval=$define
-		;;
-	*)	cnt_lval=$d_stdio_cnt_lval;;
-	esac
-	case "$stdio_base" in
-	'') stdio_base='((fp)->_base)';;
-	esac
-	case "$stdio_bufsiz" in
-	'') stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)';;
-	esac
-fi
-
-: test whether _ptr and _cnt really work
-echo "Checking how std your stdio is..." >&4
-$cat >try.c <<EOP
-#include <stdio.h>
-#define FILE_ptr(fp)	$stdio_ptr
-#define FILE_cnt(fp)	$stdio_cnt
-int main() {
-	FILE *fp = fopen("try.c", "r");
-	char c = getc(fp);
-	if (
-		18 <= FILE_cnt(fp) &&
-		strncmp(FILE_ptr(fp), "include <stdio.h>\n", 18) == 0
-	)
-		exit(0);
-	exit(1);
-}
-EOP
-val="$undef"
-set try
-if eval $compile && $to try.c; then
-	if $run ./try; then
-		echo "Your stdio acts pretty std."
-		val="$define"
-	else
-		echo "Your stdio isn't very std."
-	fi
-else
-	echo "Your stdio doesn't appear very std."
-fi
-$rm -f try.c try
-set d_stdstdio
-eval $setvar
-
-: Can _ptr be used as an lvalue?
-case "$d_stdstdio$ptr_lval" in
-$define$define) val=$define ;;
-*) val=$undef ;;
-esac
-set d_stdio_ptr_lval
-eval $setvar
-
-: Can _cnt be used as an lvalue?
-case "$d_stdstdio$cnt_lval" in
-$define$define) val=$define ;;
-*) val=$undef ;;
-esac
-set d_stdio_cnt_lval
-eval $setvar
-
-
-: test whether setting _ptr sets _cnt as a side effect
-d_stdio_ptr_lval_sets_cnt="$undef"
-d_stdio_ptr_lval_nochange_cnt="$undef"
-case "$d_stdio_ptr_lval$d_stdstdio" in
-$define$define)
-	echo "Checking to see what happens if we set the stdio ptr..." >&4
-$cat >try.c <<EOP
-#include <stdio.h>
-/* Can we scream? */
-/* Eat dust sed :-) */
-/* In the buffer space, no one can hear you scream. */
-#define FILE_ptr(fp)	$stdio_ptr
-#define FILE_cnt(fp)	$stdio_cnt
-#include <sys/types.h>
-int main() {
-	FILE *fp = fopen("try.c", "r");
-	int c;
-	char *ptr;
-	size_t cnt;
-	if (!fp) {
-	    puts("Fail even to read");
-	    exit(1);
-	}
-	c = getc(fp); /* Read away the first # */
-	if (c == EOF) {
-	    puts("Fail even to read");
-	    exit(1);
-	}
-	if (!(
-		18 <= FILE_cnt(fp) &&
-		strncmp(FILE_ptr(fp), "include <stdio.h>\n", 18) == 0
-	)) {
-		puts("Fail even to read");
-		exit (1);
-	}
-	ptr = (char*) FILE_ptr(fp);
-	cnt = (size_t)FILE_cnt(fp);
-
-	FILE_ptr(fp) += 42;
-
-	if ((char*)FILE_ptr(fp) != (ptr + 42)) {
-		printf("Fail ptr check %p != %p", FILE_ptr(fp), (ptr + 42));
-		exit (1);
-	}
-	if (FILE_cnt(fp) <= 20) {
-		printf ("Fail (<20 chars to test)");
-		exit (1);
-	}
-	if (strncmp(FILE_ptr(fp), "Eat dust sed :-) */\n", 20) != 0) {
-		puts("Fail compare");
-		exit (1);
-	}
-	if (cnt == FILE_cnt(fp)) {
-		puts("Pass_unchanged");
-		exit (0);
-	}	
-	if (FILE_cnt(fp) == (cnt - 42)) {
-		puts("Pass_changed");
-		exit (0);
-	}
-	printf("Fail count was %d now %d\n", cnt, FILE_cnt(fp));
-	return 1;
-
-}
-EOP
-	set try
-	if eval $compile && $to try.c; then
- 		case `$run ./try` in
-		Pass_changed)
-			echo "Increasing ptr in your stdio decreases cnt by the same amount.  Good." >&4
-			d_stdio_ptr_lval_sets_cnt="$define" ;;
-		Pass_unchanged)
-			echo "Increasing ptr in your stdio leaves cnt unchanged.  Good." >&4
-			d_stdio_ptr_lval_nochange_cnt="$define" ;;
-		Fail*)
-			echo "Increasing ptr in your stdio didn't do exactly what I expected.  We'll not be doing that then." >&4 ;;
-		*)
-			echo "It appears attempting to set ptr in your stdio is a bad plan." >&4 ;;
-	esac
-	else
-		echo "It seems we can't set ptr in your stdio.  Nevermind." >&4
-	fi
-	$rm -f try.c try
-	;;
-esac
-
-: see if _base is also standard
-val="$undef"
-case "$d_stdstdio" in
-$define)
-	$cat >try.c <<EOP
-#include <stdio.h>
-#define FILE_base(fp)	$stdio_base
-#define FILE_bufsiz(fp)	$stdio_bufsiz
-int main() {
-	FILE *fp = fopen("try.c", "r");
-	char c = getc(fp);
-	if (
-		19 <= FILE_bufsiz(fp) &&
-		strncmp(FILE_base(fp), "#include <stdio.h>\n", 19) == 0
-	)
-		exit(0);
-	exit(1);
-}
-EOP
-	set try
-	if eval $compile && $to try.c; then
-		if $run ./try; then
-			echo "And its _base field acts std."
-			val="$define"
-		else
-			echo "But its _base field isn't std."
-		fi
-	else
-		echo "However, it seems to be lacking the _base field."
-	fi
-	$rm -f try.c try
+	set d_statfs_f_flags
+	eval $setvar
 	;;
 esac
-set d_stdiobase
-eval $setvar
+case "$d_statfs_f_flags" in
+"$define")      echo "Yes, it does."   ;;
+*)              echo "No, it doesn't." ;;
+esac
 
 $cat >&4 <<EOM
 Checking how to access stdio streams by file descriptor number...
@@ -13072,10 +16757,67 @@ if test "X$d_strerror" = X -o "X$d_syserrlst" = X; then
     fi
 fi
 
+: see if strerror_r exists
+set strerror_r d_strerror_r
+eval $inlibc
+case "$d_strerror_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_string string.h"
+	case "$d_strerror_r_proto:$usethreads" in
+	":define")	d_strerror_r_proto=define
+		set d_strerror_r_proto strerror_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_strerror_r_proto" in
+	define)
+	case "$strerror_r_proto" in
+	''|0) try='int strerror_r(int, char*, size_t);'
+	./protochk "extern $try" $hdrs && strerror_r_proto=I_IBW ;;
+	esac
+	case "$strerror_r_proto" in
+	''|0) try='int strerror_r(int, char*, int);'
+	./protochk "extern $try" $hdrs && strerror_r_proto=I_IBI ;;
+	esac
+	case "$strerror_r_proto" in
+	''|0) try='char* strerror_r(int, char*, size_t);'
+	./protochk "extern $try" $hdrs && strerror_r_proto=B_IBW ;;
+	esac
+	case "$strerror_r_proto" in
+	''|0)	d_strerror_r=undef
+ 	        strerror_r_proto=0
+		echo "Disabling strerror_r, cannot determine prototype." >&4 ;;
+	* )	case "$strerror_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) strerror_r_proto="REENTRANT_PROTO_$strerror_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "strerror_r has no prototype, not using it." >&4 ;;
+		esac
+		d_strerror_r=undef
+		strerror_r_proto=0
+		;;
+	esac
+	;;
+*)	strerror_r_proto=0
+	;;
+esac
+
 : see if strftime exists
 set strftime d_strftime
 eval $inlibc
 
+: see if strlcat exists
+set strlcat d_strlcat
+eval $inlibc
+
+: see if strlcpy exists
+set strlcpy d_strlcpy
+eval $inlibc
+
 : see if strtod exists
 set strtod d_strtod
 eval $inlibc
@@ -13372,6 +17114,24 @@ echo " "
 set d_telldirproto telldir $i_systypes sys/types.h $i_dirent dirent.h
 eval $hasproto
 
+: see if time exists
+echo " "
+if test "X$d_time" = X -o X"$timetype" = X; then
+    if set time val -f d_time; eval $csym; $val; then
+		echo 'time() found.' >&4
+		val="$define"
+		rp="What is the type returned by time() on this system?"
+		set time_t timetype long stdio.h sys/types.h
+		eval $typedef_ask
+    else
+		echo 'time() not found, hope that will do.' >&4
+		val="$undef"
+		timetype='int';
+    fi
+    set d_time
+    eval $setvar
+fi
+
 : see if this is a sys/times.h system
 set sys/times.h i_systimes
 eval $inhdr
@@ -13394,10 +17154,100 @@ else
 	clocktype='int'
 fi
 
+: see if tmpnam_r exists
+set tmpnam_r d_tmpnam_r
+eval $inlibc
+case "$d_tmpnam_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h "
+	case "$d_tmpnam_r_proto:$usethreads" in
+	":define")	d_tmpnam_r_proto=define
+		set d_tmpnam_r_proto tmpnam_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_tmpnam_r_proto" in
+	define)
+	case "$tmpnam_r_proto" in
+	''|0) try='char* tmpnam_r(char*);'
+	./protochk "extern $try" $hdrs && tmpnam_r_proto=B_B ;;
+	esac
+	case "$tmpnam_r_proto" in
+	''|0)	d_tmpnam_r=undef
+ 	        tmpnam_r_proto=0
+		echo "Disabling tmpnam_r, cannot determine prototype." >&4 ;;
+	* )	case "$tmpnam_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) tmpnam_r_proto="REENTRANT_PROTO_$tmpnam_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "tmpnam_r has no prototype, not using it." >&4 ;;
+		esac
+		d_tmpnam_r=undef
+		tmpnam_r_proto=0
+		;;
+	esac
+	;;
+*)	tmpnam_r_proto=0
+	;;
+esac
+
 : see if truncate exists
 set truncate d_truncate
 eval $inlibc
 
+: see if ttyname_r exists
+set ttyname_r d_ttyname_r
+eval $inlibc
+case "$d_ttyname_r" in
+"$define")
+	hdrs="$i_systypes sys/types.h define stdio.h $i_unistd unistd.h"
+	case "$d_ttyname_r_proto:$usethreads" in
+	":define")	d_ttyname_r_proto=define
+		set d_ttyname_r_proto ttyname_r $hdrs
+		eval $hasproto ;;
+	*)	;;
+	esac
+	case "$d_ttyname_r_proto" in
+	define)
+	case "$ttyname_r_proto" in
+	''|0) try='int ttyname_r(int, char*, size_t);'
+	./protochk "extern $try" $hdrs && ttyname_r_proto=I_IBW ;;
+	esac
+	case "$ttyname_r_proto" in
+	''|0) try='int ttyname_r(int, char*, int);'
+	./protochk "extern $try" $hdrs && ttyname_r_proto=I_IBI ;;
+	esac
+	case "$ttyname_r_proto" in
+	''|0) try='char* ttyname_r(int, char*, int);'
+	./protochk "extern $try" $hdrs && ttyname_r_proto=B_IBI ;;
+	esac
+	case "$ttyname_r_proto" in
+	''|0)	d_ttyname_r=undef
+ 	        ttyname_r_proto=0
+		echo "Disabling ttyname_r, cannot determine prototype." >&4 ;;
+	* )	case "$ttyname_r_proto" in
+		REENTRANT_PROTO*) ;;
+		*) ttyname_r_proto="REENTRANT_PROTO_$ttyname_r_proto" ;;
+		esac
+		echo "Prototype: $try" ;;
+	esac
+	;;
+	*)	case "$usethreads" in
+		define) echo "ttyname_r has no prototype, not using it." >&4 ;;
+		esac
+		d_ttyname_r=undef
+		ttyname_r_proto=0
+		;;
+	esac
+	;;
+*)	ttyname_r_proto=0
+	;;
+esac
+
 : see if tzname[] exists
 echo " "
 if set tzname val -a d_tzname; eval $csym; $val; then
@@ -13417,7 +17267,7 @@ case "$multiarch" in
 ''|[nN]*) multiarch="$undef" ;;
 esac
 
-: check for ordering of bytes in a long
+: check for ordering of bytes in a UV
 echo " "
 case "$usecrosscompile$multiarch" in
 *$define*)
@@ -13440,21 +17290,27 @@ an Alpha will report 12345678. If the test program works the default is
 probably right.
 I'm now running the test program...
 EOM
-		$cat >try.c <<'EOCP'
+		$cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#include <sys/types.h>
+typedef $uvtype UV;
 int main()
 {
 	int i;
 	union {
-		unsigned long l;
-		char c[sizeof(long)];
+		UV l;
+		char c[$uvsize];
 	} u;
 
-	if (sizeof(long) > 4)
-		u.l = (0x08070605L << 32) | 0x04030201L;
+	if ($uvsize > 4)
+		u.l = (((UV)0x08070605) << 32) | (UV)0x04030201;
 	else
-		u.l = 0x04030201L;
-	for (i = 0; i < sizeof(long); i++)
+		u.l = (UV)0x04030201;
+	for (i = 0; i < $uvsize; i++)
 		printf("%c", u.c[i]+'0');
 	printf("\n");
 	exit(0);
@@ -13481,7 +17337,7 @@ EOM
 		fi
 		case "$xxx_prompt" in
 		y)
-			rp="What is the order of bytes in a long?"
+			rp="What is the order of bytes in $uvtype?"
 			. ./myread
 			byteorder="$ans"
 			;;
@@ -13502,6 +17358,10 @@ EOM
 case "$d_u32align" in
 '')   $cat >try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #define U32 $u32type
 #define BYTEORDER 0x$byteorder
 #define U8 $u8type
@@ -13530,10 +17390,10 @@ int main() {
     buf[1] = 0;
     buf[2] = 0;
     buf[3] = 1;
+    buf[4] = 0;
     buf[5] = 0;
     buf[6] = 0;
-    buf[7] = 0;
-    buf[8] = 1;
+    buf[7] = 1;
 
     for (i = 0; i < 4; i++) {
 	up = (U32*)(buf + i);
@@ -13606,6 +17466,10 @@ eval $inlibc
 set unordered d_unordered
 eval $inlibc
 
+: see if unsetenv exists
+set unsetenv d_unsetenv
+eval $inlibc
+
 : see if usleep exists
 set usleep d_usleep
 eval $inlibc
@@ -13809,9 +17673,9 @@ esac
 : set the base revision
 baserev=5.0
 
-: how do we catenate cpp tokens here?
+: how do we concatenate cpp tokens here?
 echo " "
-echo "Checking to see how your cpp does stuff like catenate tokens..." >&4
+echo "Checking to see how your cpp does stuff like concatenate tokens..." >&4
 $cat >cpp_stuff.c <<'EOCP'
 #define RCAT(a,b)a/**/b
 #define ACAT(a,b)a ## b
@@ -13830,8 +17694,8 @@ elif $contains 'Reiser' cpp_stuff.out >/dev/null 2>&1; then
 	cpp_stuff=1
 else
 	$cat >&4 <<EOM
-Hmm, I don't seem to be able to catenate tokens with your cpp.  You're going
-to have to edit the values of CAT[2-5] in config.h...
+Hmm, I don't seem to be able to concatenate tokens with your cpp.
+You're going to have to edit the values of CAT[2-5] in config.h...
 EOM
 	cpp_stuff="/* Help! How do we handle cpp_stuff? */*/"
 fi
@@ -13853,6 +17717,10 @@ $define)
 #endif
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <db.h>
 int main(int argc, char *argv[])
 {
@@ -14191,6 +18059,10 @@ sunos) $echo '#define PERL_FFLUSH_ALL_FOPEN_MAX 32' > try.c ;;
 esac
 $cat >>try.c <<EOCP
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #$i_unistd I_UNISTD
 #ifdef I_UNISTD
 # include <unistd.h>
@@ -14507,6 +18379,10 @@ echo "Checking the size of $zzz..." >&4
 cat > try.c <<EOCP
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
     printf("%d\n", (int)sizeof($gidtype));
     exit(0);
@@ -15036,47 +18912,6 @@ EOCP
 	;;
 esac
 
-: define a fucntion to check prototypes
-$cat > protochk <<EOSH
-$startsh
-cc="$cc"
-optimize="$optimize"
-ccflags="$ccflags"
-prototype="$prototype"
-define="$define"
-rm=$rm
-EOSH
-
-$cat >> protochk <<'EOSH'
-
-$rm -f try.c
-foo="$1"
-shift
-while test $# -ge 2; do
-	case "$1" in
-		$define) echo "#include <$2>" >> try.c ;;
-		literal) echo "$2" >> try.c ;;
-	esac
-    shift 2
-done
-test "$prototype" = "$define"  && echo '#define CAN_PROTOTYPE' >> try.c
-cat >> try.c <<'EOCP'
-#ifdef CAN_PROTOTYPE
-#define	_(args) args
-#else
-#define	_(args) ()
-#endif
-EOCP
-echo "$foo" >> try.c
-echo 'int no_real_function_has_this_name _((void)) { return 0; }' >> try.c
-$cc $optimize $ccflags -c try.c > /dev/null 2>&1
-status=$?
-$rm -f try.[co]
-exit $status
-EOSH
-chmod +x protochk
-$eunicefix protochk
-
 : see what type is used for size_t
 rp="What is the type used for the length parameter for string functions?"
 set size_t sizetype 'unsigned int' stdio.h sys/types.h
@@ -15210,6 +19045,7 @@ EOM
 	esac
 fi
 : locate the preferred pager for this system
+fn=f/
 case "$pager" in
 '')
 	dflt=''
@@ -15229,10 +19065,14 @@ case "$pager" in
 	'') dflt=/usr/ucb/more;;
 	esac
 	;;
-*) dflt="$pager";;
+*)	dflt="$pager"
+	: Instruct ./getfile to trust the hinted or previous pager value,
+	: even if it does not begin with a slash.  For example, on os2,
+	: pager might be cmd /c more.  See comments in UU/getfile.
+	fn="f/($pager)"
+	;;
 esac
 echo " "
-fn=f/
 rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"
@@ -15242,21 +19082,16 @@ rp="What is the type of process ids on this system?"
 set pid_t pidtype int stdio.h sys/types.h
 eval $typedef_ask
 
-: Find earliest binary compatible site_perl subdirectory perl can use.
-case "$bincompat5005" in
-"$define") xs_apiversion='5.005' ;;
-*) xs_apiversion=$version ;;   # The current site_perl version.
-esac
-: Find earliest pure perl site_perl subdirectory perl can use.
-: The versioned directories started at 5.005.
-pm_apiversion='5.005'
-
 : see if ar generates random libraries by itself
 echo " "
 echo "Checking how to generate random libraries on your machine..." >&4
 echo 'int bar1() { return bar2(); }' > bar1.c
 echo 'int bar2() { return 2; }' > bar2.c
-$cat > foo.c <<'EOP'
+$cat > foo.c <<EOP
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() { printf("%d\n", bar1()); exit(0); }
 EOP
 $cc $ccflags -c bar1.c >/dev/null 2>&1
@@ -15267,7 +19102,9 @@ if $cc -o foobar $ccflags $ldflags foo$_o bar$_a $libs > /dev/null 2>&1 &&
 	$run ./foobar >/dev/null 2>&1; then
 	echo "$ar appears to generate random libraries itself."
 	orderlib=false
-	ranlib=":"
+	if [ "X$ranlib" = "X" ]; then
+	    ranlib=":"
+	fi
 elif $ar ts bar$_a >/dev/null 2>&1 &&
 	$cc -o foobar $ccflags $ldflags foo$_o bar$_a $libs > /dev/null 2>&1 &&
 	$run ./foobar >/dev/null 2>&1; then
@@ -15346,7 +19183,8 @@ esac
 
 : check for the select 'width'
 case "$selectminbits" in
-'') case "$d_select" in
+'') safebits=`expr $ptrsize \* 8`
+    case "$d_select" in
 	$define)
 		$cat <<EOM
 
@@ -15378,25 +19216,31 @@ EOM
 #   include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
 #endif
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 $selecttype b;
 #define S sizeof(*(b))
 #define MINBITS	64
 #define NBYTES (S * 8 > MINBITS ? S : MINBITS/8)
 #define NBITS  (NBYTES * 8)
 int main() {
-    char s[NBYTES];
+    char *s = malloc(NBYTES);
     struct timeval t;
     int i;
     FILE* fp;
     int fd;
 
+    if (!s)
+	exit(1);
     fclose(stdin);
     fp = fopen("try.c", "r");
     if (fp == 0)
-      exit(1);
+      exit(2);
     fd = fileno(fp);
     if (fd < 0)
-      exit(2);
+      exit(3);
     b = ($selecttype)s;
     for (i = 0; i < NBITS; i++)
 	FD_SET(i, b);
@@ -15404,6 +19248,7 @@ int main() {
     t.tv_usec = 0;
     select(fd + 1, b, 0, 0, &t);
     for (i = NBITS - 1; i > fd && FD_ISSET(i, b); i--);
+    free(s);
     printf("%d\n", i + 1);
     return 0;
 }
@@ -15414,10 +19259,10 @@ EOCP
 			case "$selectminbits" in
 			'')	cat >&4 <<EOM
 Cannot figure out on how many bits at a time your select() operates.
-I'll play safe and guess it is 32 bits.
+I'll play safe and guess it is $safebits bits.
 EOM
-				selectminbits=32
-				bits="32 bits"
+				selectminbits=$safebits
+				bits="$safebits bits"
 				;;
 			1)	bits="1 bit" ;;
 			*)	bits="$selectminbits bits" ;;
@@ -15426,7 +19271,8 @@ EOM
 		else
 			rp='What is the minimum number of bits your select() operates on?'
 			case "$byteorder" in
-			1234|12345678)	dflt=32 ;;
+			12345678)	dflt=64 ;;
+			1234)		dflt=32 ;;
 			*)		dflt=1	;;
 			esac
 			. ./myread
@@ -15436,7 +19282,7 @@ EOM
 		$rm -f try.* try
 		;;
 	*)	: no select, so pick a harmless default
-		selectminbits='32'
+		selectminbits=$safebits
 		;;
 	esac
 	;;
@@ -15483,9 +19329,13 @@ xxx="$xxx SYS TERM THAW TRAP TSTP TTIN TTOU URG USR1 USR2"
 xxx="$xxx USR3 USR4 VTALRM WAITING WINCH WIND WINDOW XCPU XFSZ"
 
 : generate a few handy files for later
-$cat > signal.c <<'EOCP'
+$cat > signal.c <<EOCP
 #include <sys/types.h>
 #include <signal.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <stdio.h>
 int main() {
 
@@ -15509,6 +19359,12 @@ int main() {
 #endif
 
 #ifndef NSIG
+#  ifdef _SIG_MAX
+#    define NSIG (_SIG_MAX+1)
+#  endif
+#endif
+
+#ifndef NSIG
 #  ifdef MAXSIG
 #    define NSIG (MAXSIG+1)
 #  endif
@@ -15522,7 +19378,7 @@ int main() {
 
 #ifndef NSIG
 #  ifdef SIGARRAYSIZE
-#    define NSIG (SIGARRAYSIZE+1) /* Not sure of the +1 */
+#    define NSIG SIGARRAYSIZE /* Assume ary[SIGARRAYSIZE] */
 #  endif
 #endif
 
@@ -15560,7 +19416,7 @@ END {
 $cat >signal.awk <<'EOP'
 BEGIN { ndups = 0 }
 $1 ~ /^NSIG$/ { nsig = $2 }
-($1 !~ /^NSIG$/) && (NF == 2) {
+($1 !~ /^NSIG$/) && (NF == 2) && ($2 ~ /^[0-9][0-9]*$/) {
     if ($2 > maxsig) { maxsig = $2 }
     if (sig_name[$2]) {
 	dup_name[ndups] = $1
@@ -15602,7 +19458,7 @@ $cat >>signal_cmd <<'EOS'
 
 set signal
 if eval $compile_ok; then
-	$run ./signal$_exe | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+	$run ./signal$_exe | ($sort -n -k 2 2>/dev/null || $sort -n +1) | $uniq | $awk -f signal.awk >signal.lst
 else
 	echo "(I can't seem be able to compile the whole test program)" >&4
 	echo "(I'll try it in little pieces.)" >&4
@@ -15636,7 +19492,7 @@ EOCP
 	done
 	if $test -s signal.ls1; then
 		$cat signal.nsg signal.ls1 |
-			$sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+			$sort -n | $uniq | $awk -f signal.awk >signal.lst
 	fi
 
 fi
@@ -15713,6 +19569,10 @@ echo "Checking the size of $zzz..." >&4
 cat > try.c <<EOCP
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
     printf("%d\n", (int)sizeof($sizetype));
     exit(0);
@@ -15816,6 +19676,10 @@ eval $typedef
 dflt="$ssizetype"
 $cat > try.c <<EOM
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 #include <sys/types.h>
 #define Size_t $sizetype
 #define SSize_t $dflt
@@ -15865,24 +19729,6 @@ $rm -f stdioh
 
 
 
-: see if time exists
-echo " "
-if test "X$d_time" = X -o X"$timetype" = X; then
-    if set time val -f d_time; eval $csym; $val; then
-		echo 'time() found.' >&4
-		val="$define"
-		rp="What is the type returned by time() on this system?"
-		set time_t timetype long stdio.h sys/types.h
-		eval $typedef_ask
-    else
-		echo 'time() not found, hope that will do.' >&4
-		val="$undef"
-		timetype='int';
-    fi
-    set d_time
-    eval $setvar
-fi
-
 : see what type uids are declared as in the kernel
 echo " "
 echo "Looking for the type for user ids returned by getuid()."
@@ -15916,6 +19762,10 @@ echo "Checking the size of $zzz..." >&4
 cat > try.c <<EOCP
 #include <sys/types.h>
 #include <stdio.h>
+#$i_stdlib I_STDLIB
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
 int main() {
     printf("%d\n", (int)sizeof($uidtype));
     exit(0);
@@ -16013,6 +19863,16 @@ case "$uidsign" in
 	;;
 esac
 
+
+case "$usesitecustomize" in
+    $define|true|[Yy]*)
+	usesitecustomize="$define"
+	;;
+    *)
+	usesitecustomize="$undef"
+	;;
+    esac
+
 : determine compiler compiler
 case "$yacc" in
 '')
@@ -16063,10 +19923,6 @@ esac
 set libutil.h i_libutil
 eval $inhdr
 
-: see if locale.h is available
-set locale.h i_locale
-eval $inhdr
-
 : see if mach cthreads are available
 if test "X$usethreads" = "X$define"; then
 	set mach/cthreads.h i_machcthr
@@ -16077,10 +19933,6 @@ fi
 
 
 
-: see if this is a math.h system
-set math.h i_math
-eval $inhdr
-
 : see if this is a mntent.h system
 set mntent.h i_mntent
 eval $inhdr
@@ -16165,13 +20017,13 @@ $echo "Guessing which symbols your C compiler and preprocessor define..." >&4
 $cat <<'EOSH' > Cppsym.know
 a29k ABI64 aegis AES_SOURCE AIX AIX32 AIX370
 AIX41 AIX42 AIX43 AIX_SOURCE aixpc ALL_SOURCE
-alliant alpha am29000 AM29000 AMD64 amiga AMIGAOS AMIX
+alliant alpha am29000 AM29000 AMD64 amd64 amiga AMIGAOS AMIX
 ansi ANSI_C_SOURCE apollo ardent ARM32 atarist att386 att3b
 BeOS BIG_ENDIAN BIT_MSF bsd BSD bsd43 bsd4_2 bsd4_3 BSD4_3 bsd4_4
 BSD_4_3 BSD_4_4 BSD_NET2 BSD_TIME BSD_TYPES BSDCOMPAT bsdi
 bull c cadmus clipper CMU COFF COMPILER_VERSION
 concurrent convex cpu cray CRAY CRAYMPP ctix CX_UX
-CYGWIN DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO
+CYGWIN DECC DGUX DGUX_SOURCE DJGPP dmert DOLPHIN DPX2 DSO
 Dynix DynixPTX ELF encore EPI EXTENSIONS FAVOR_BSD
 FILE_OFFSET_BITS FreeBSD GCC_NEW_VARARGS gcos gcx gimpel
 GLIBC GLIBC_MINOR
@@ -16223,7 +20075,7 @@ USE_BSD USE_FILE_OFFSET64 USE_GNU USE_ISOC9X USE_LARGEFILE USE_LARGEFILE64
 USE_MISC USE_POSIX USE_POSIX199309 USE_POSIX199506 USE_POSIX2
 USE_REENTRANT USE_SVID USE_UNIX98 USE_XOPEN USE_XOPEN_EXTENDED
 USGr4 USGr4_2
-Utek UTek UTS UWIN uxpm uxps vax venix VMESA vms xenix Xenix286
+Utek UTek UTS UWIN uxpm uxps vax venix VMESA vms x86_64 xenix Xenix286
 XOPEN_SOURCE XOPEN_SOURCE_EXTENDED XPG2 XPG2_EXTENDED
 XPG3 XPG3_EXTENDED XPG4 XPG4_EXTENDED
 z8000
@@ -16296,7 +20148,7 @@ for i in \`$cc -v -c tmp.c 2>&1 $postprocess_cc_v\`
 do
 	case "\$i" in
 	-D*) echo "\$i" | $sed 's/^-D//';;
-	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A\(.*\)(\(.*\))/\1=\2/';;
+	-A*) $test "$gccversion" && echo "\$i" | $sed 's/^-A//' | $sed 's/\(.*\)(\(.*\))/\1=\2/';;
 	esac
 done
 $rm -f try.c
@@ -16413,10 +20265,6 @@ set i_termio; eval $setvar
 val=$val2; set i_sgtty; eval $setvar
 val=$val3; set i_termios; eval $setvar
 
-: see if this is a shadow.h system
-set shadow.h i_shadow
-eval $inhdr
-
 : see if stddef is available
 set stddef.h i_stddef
 eval $inhdr
@@ -16622,7 +20470,7 @@ for xxx in $known_extensions ; do
 		case "$i_ndbm" in
 		$define)
 		    case "$osname-$use64bitint" in
-		    cygwin-*|hpux-define)
+		    hpux-define)
 			case "$libs" in
 			*-lndbm*) avail_ext="$avail_ext $xxx" ;;
 			esac
@@ -16636,7 +20484,7 @@ for xxx in $known_extensions ; do
 		case "${i_dbm}${i_rpcsvcdbm}" in
 		*"${define}"*)
 		    case "$osname-$use64bitint" in
-		    cygwin-*|hpux-define)
+		    hpux-define)
 			case "$libs" in
 			*-ldbm*) avail_ext="$avail_ext $xxx" ;;
 			esac
@@ -16680,14 +20528,33 @@ for xxx in $known_extensions ; do
                         esac
 		esac
 		;;
-	threads|threads/shared)
-                case "$usethreads" in
-                true|$define|y)
-                        case "$useithreads" in
-                        $define|true|[yY]*) avail_ext="$avail_ext $xxx" ;;
-                        esac
+	XS/APItest|xs/apitest)
+		# This is just for testing.  Skip it unless we have dynamic loading.
+
+		case "$usedl" in
+		$define) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	XS/Typemap|xs/typemap)
+		# This is just for testing.  Skip it unless we have dynamic loading.
+		case "$usedl" in
+		$define) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
+	threads|threads/shared)
+		# threads and threads::shared are special cases.
+		# To stop people from asking "Perl 5.8.0 was supposed
+		# to have this new fancy threads implementation but my
+		# perl doesn't have it" and from people trying to
+		# (re)install the threads module using CPAN.pm and
+		# CPAN.pm then offering to reinstall Perl 5.8.0,
+		# the threads.pm and threads/shared.pm will always be
+		# there, croaking informatively ("you need to rebuild
+		# all of Perl with threads, sorry") when threads haven't
+		# been compiled in.
+		# --jhi
+		avail_ext="$avail_ext $xxx"
+		;;
 	IPC/SysV|ipc/sysv)
 		: XXX Do we need a useipcsysv variable here
 		case "${d_msg}${d_sem}${d_shm}" in 
@@ -16703,6 +20570,39 @@ set X $avail_ext
 shift
 avail_ext="$*"
 
+case "$onlyextensions" in
+'') ;;
+*)  keepextensions=''
+    echo "You have requested that only certains extensions be included..." >&4
+    for i in $onlyextensions; do
+        case " $avail_ext " in
+        *" $i "*)
+            echo "Keeping extension $i."
+            keepextensions="$keepextensions $i"
+            ;;
+        *) echo "Ignoring extension $i." ;;
+        esac
+    done
+    avail_ext="$keepextensions"
+    ;;
+esac
+
+case "$noextensions" in
+'') ;;
+*)  keepextensions=''
+    echo "You have requested that certain extensions be ignored..." >&4
+    for i in $avail_ext; do
+        case " $noextensions " in
+        *" $i "*) echo "Ignoring extension $i." ;;
+        *) echo "Keeping extension $i.";
+           keepextensions="$keepextensions $i"
+           ;;
+        esac
+    done
+    avail_ext="$keepextensions"
+    ;;
+esac
+
 : Now see which nonxs extensions are supported on this system.
 : For now assume all are.
 nonxs_ext=''
@@ -16728,7 +20628,19 @@ Note that DynaLoader is always built and need not be mentioned here.
 
 EOM
 	case "$dynamic_ext" in
-	'') dflt="$avail_ext" ;;
+	'')
+		: Exclude those listed in static_ext
+		dflt=''
+		for xxx in $avail_ext; do
+			case " $static_ext " in
+			*" $xxx "*) ;;
+			*) dflt="$dflt $xxx" ;;
+			esac
+		done
+		set X $dflt
+		shift
+		dflt="$*"
+		;;
 	*)	dflt="$dynamic_ext"
 		# Perhaps we are reusing an old out-of-date config.sh.
 		case "$hint" in
@@ -16824,11 +20736,42 @@ EOM
 	esac
 	;;
 esac
+#        
+# Encode is a special case.  If we are building Encode as a static
+# extension, we need to explicitly list its subextensions as well.
+# For other nested extensions, this is handled automatically by
+# the appropriate Makefile.PL.
+case " $static_ext " in
+	*" Encode "*) # Add the subextensions of Encode
+	cd "$rsrc/ext"
+	for xxx in `ls Encode/*/Makefile.PL|awk -F/ '{print $2}'`; do
+		static_ext="$static_ext Encode/$xxx"
+	done
+	cd "$tdir"
+	;;
+esac
 
 set X $dynamic_ext $static_ext $nonxs_ext
 shift
 extensions="$*"
 
+# Sanity check:  We require an extension suitable for use with
+# AnyDBM_File, as well as Fcntl and IO.  (Failure to have these
+# should show up as failures in the test suite, but it's helpful to
+# catch them now.) The 'extensions' list is normally sorted
+# alphabetically, so we need to accept either
+#    DB_File ... Fcntl ... IO  ....
+# or something like
+#    Fcntl ... NDBM_File ... IO  ....
+case " $extensions"  in
+*"_File "*" Fcntl "*" IO "*) ;; # DB_File
+*" Fcntl "*"_File "*" IO "*) ;; # GDBM_File
+*" Fcntl "*" IO "*"_File "*) ;; # NDBM_File
+*) echo "WARNING: Extensions DB_File or *DBM_File, Fcntl, and IO not configured." >&4
+   echo "WARNING: The Perl you are building will be quite crippled." >& 4
+   ;;
+esac
+
 : Remove libraries needed only for extensions
 : The appropriate ext/Foo/Makefile.PL will add them back in, if necessary.
 : The exception is SunOS 4.x, which needs them.
@@ -16950,11 +20893,11 @@ archlibexp='$archlibexp'
 archname64='$archname64'
 archname='$archname'
 archobjs='$archobjs'
+asctime_r_proto='$asctime_r_proto'
 awk='$awk'
 baserev='$baserev'
 bash='$bash'
 bin='$bin'
-bincompat5005='$bincompat5005'
 binexp='$binexp'
 bison='$bison'
 byacc='$byacc'
@@ -16992,8 +20935,11 @@ cppminus='$cppminus'
 cpprun='$cpprun'
 cppstdin='$cppstdin'
 cppsymbols='$cppsymbols'
+crypt_r_proto='$crypt_r_proto'
 cryptlib='$cryptlib'
 csh='$csh'
+ctermid_r_proto='$ctermid_r_proto'
+ctime_r_proto='$ctime_r_proto'
 d_Gconvert='$d_Gconvert'
 d_PRIEUldbl='$d_PRIEUldbl'
 d_PRIFUldbl='$d_PRIFUldbl'
@@ -17011,14 +20957,21 @@ d_SCNfldbl='$d_SCNfldbl'
 d__fwalk='$d__fwalk'
 d_access='$d_access'
 d_accessx='$d_accessx'
+d_aintl='$d_aintl'
 d_alarm='$d_alarm'
 d_archlib='$d_archlib'
+d_asctime_r='$d_asctime_r'
 d_atolf='$d_atolf'
 d_atoll='$d_atoll'
-d_attribut='$d_attribut'
+d_attribute_format='$d_attribute_format'
+d_attribute_malloc='$d_attribute_malloc'
+d_attribute_nonnull='$d_attribute_nonnull'
+d_attribute_noreturn='$d_attribute_noreturn'
+d_attribute_pure='$d_attribute_pure'
+d_attribute_unused='$d_attribute_unused'
+d_attribute_warn_unused_result='$d_attribute_warn_unused_result'
 d_bcmp='$d_bcmp'
 d_bcopy='$d_bcopy'
-d_bincompat5005='$d_bincompat5005'
 d_bsd='$d_bsd'
 d_bsdgetpgrp='$d_bsdgetpgrp'
 d_bsdsetpgrp='$d_bsdsetpgrp'
@@ -17030,11 +20983,16 @@ d_chown='$d_chown'
 d_chroot='$d_chroot'
 d_chsize='$d_chsize'
 d_class='$d_class'
+d_clearenv='$d_clearenv'
 d_closedir='$d_closedir'
 d_cmsghdr_s='$d_cmsghdr_s'
 d_const='$d_const'
+d_copysignl='$d_copysignl'
 d_crypt='$d_crypt'
+d_crypt_r='$d_crypt_r'
 d_csh='$d_csh'
+d_ctermid_r='$d_ctermid_r'
+d_ctime_r='$d_ctime_r'
 d_cuserid='$d_cuserid'
 d_dbl_dig='$d_dbl_dig'
 d_dbminitproto='$d_dbminitproto'
@@ -17045,17 +21003,25 @@ d_dlerror='$d_dlerror'
 d_dlopen='$d_dlopen'
 d_dlsymun='$d_dlsymun'
 d_dosuid='$d_dosuid'
+d_drand48_r='$d_drand48_r'
 d_drand48proto='$d_drand48proto'
 d_dup2='$d_dup2'
 d_eaccess='$d_eaccess'
 d_endgrent='$d_endgrent'
+d_endgrent_r='$d_endgrent_r'
 d_endhent='$d_endhent'
+d_endhostent_r='$d_endhostent_r'
 d_endnent='$d_endnent'
+d_endnetent_r='$d_endnetent_r'
 d_endpent='$d_endpent'
+d_endprotoent_r='$d_endprotoent_r'
 d_endpwent='$d_endpwent'
+d_endpwent_r='$d_endpwent_r'
 d_endsent='$d_endsent'
+d_endservent_r='$d_endservent_r'
 d_eofnblk='$d_eofnblk'
 d_eunice='$d_eunice'
+d_faststdio='$d_faststdio'
 d_fchdir='$d_fchdir'
 d_fchmod='$d_fchmod'
 d_fchown='$d_fchown'
@@ -17090,19 +21056,29 @@ d_getcwd='$d_getcwd'
 d_getespwnam='$d_getespwnam'
 d_getfsstat='$d_getfsstat'
 d_getgrent='$d_getgrent'
+d_getgrent_r='$d_getgrent_r'
+d_getgrgid_r='$d_getgrgid_r'
+d_getgrnam_r='$d_getgrnam_r'
 d_getgrps='$d_getgrps'
 d_gethbyaddr='$d_gethbyaddr'
 d_gethbyname='$d_gethbyname'
 d_gethent='$d_gethent'
 d_gethname='$d_gethname'
+d_gethostbyaddr_r='$d_gethostbyaddr_r'
+d_gethostbyname_r='$d_gethostbyname_r'
+d_gethostent_r='$d_gethostent_r'
 d_gethostprotos='$d_gethostprotos'
 d_getitimer='$d_getitimer'
 d_getlogin='$d_getlogin'
+d_getlogin_r='$d_getlogin_r'
 d_getmnt='$d_getmnt'
 d_getmntent='$d_getmntent'
 d_getnbyaddr='$d_getnbyaddr'
 d_getnbyname='$d_getnbyname'
 d_getnent='$d_getnent'
+d_getnetbyaddr_r='$d_getnetbyaddr_r'
+d_getnetbyname_r='$d_getnetbyname_r'
+d_getnetent_r='$d_getnetent_r'
 d_getnetprotos='$d_getnetprotos'
 d_getpagsz='$d_getpagsz'
 d_getpbyname='$d_getpbyname'
@@ -17113,19 +21089,31 @@ d_getpgrp2='$d_getpgrp2'
 d_getpgrp='$d_getpgrp'
 d_getppid='$d_getppid'
 d_getprior='$d_getprior'
+d_getprotobyname_r='$d_getprotobyname_r'
+d_getprotobynumber_r='$d_getprotobynumber_r'
+d_getprotoent_r='$d_getprotoent_r'
 d_getprotoprotos='$d_getprotoprotos'
 d_getprpwnam='$d_getprpwnam'
 d_getpwent='$d_getpwent'
+d_getpwent_r='$d_getpwent_r'
+d_getpwnam_r='$d_getpwnam_r'
+d_getpwuid_r='$d_getpwuid_r'
 d_getsbyname='$d_getsbyname'
 d_getsbyport='$d_getsbyport'
 d_getsent='$d_getsent'
+d_getservbyname_r='$d_getservbyname_r'
+d_getservbyport_r='$d_getservbyport_r'
+d_getservent_r='$d_getservent_r'
 d_getservprotos='$d_getservprotos'
 d_getspnam='$d_getspnam'
+d_getspnam_r='$d_getspnam_r'
 d_gettimeod='$d_gettimeod'
+d_gmtime_r='$d_gmtime_r'
 d_gnulibc='$d_gnulibc'
 d_grpasswd='$d_grpasswd'
 d_hasmntopt='$d_hasmntopt'
 d_htonl='$d_htonl'
+d_ilogbl='$d_ilogbl'
 d_index='$d_index'
 d_inetaton='$d_inetaton'
 d_int64_t='$d_int64_t'
@@ -17137,7 +21125,9 @@ d_isnanl='$d_isnanl'
 d_killpg='$d_killpg'
 d_lchown='$d_lchown'
 d_ldbl_dig='$d_ldbl_dig'
+d_libm_lib_version='$d_libm_lib_version'
 d_link='$d_link'
+d_localtime_r='$d_localtime_r'
 d_locconv='$d_locconv'
 d_lockf='$d_lockf'
 d_longdbl='$d_longdbl'
@@ -17145,6 +21135,8 @@ d_longlong='$d_longlong'
 d_lseekproto='$d_lseekproto'
 d_lstat='$d_lstat'
 d_madvise='$d_madvise'
+d_malloc_good_size='$d_malloc_good_size'
+d_malloc_size='$d_malloc_size'
 d_mblen='$d_mblen'
 d_mbstowcs='$d_mbstowcs'
 d_mbtowc='$d_mbtowc'
@@ -17162,6 +21154,7 @@ d_mktime='$d_mktime'
 d_mmap='$d_mmap'
 d_modfl='$d_modfl'
 d_modfl_pow32_bug='$d_modfl_pow32_bug'
+d_modflproto='$d_modflproto'
 d_mprotect='$d_mprotect'
 d_msg='$d_msg'
 d_msg_ctrunc='$d_msg_ctrunc'
@@ -17180,7 +21173,7 @@ d_mymalloc='$d_mymalloc'
 d_nice='$d_nice'
 d_nl_langinfo='$d_nl_langinfo'
 d_nv_preserves_uv='$d_nv_preserves_uv'
-d_nv_preserves_uv_bits='$d_nv_preserves_uv_bits'
+d_nv_zero_is_allbits_zero='$d_nv_zero_is_allbits_zero'
 d_off64_t='$d_off64_t'
 d_old_pthread_create_joinable='$d_old_pthread_create_joinable'
 d_oldpthreads='$d_oldpthreads'
@@ -17195,6 +21188,7 @@ d_poll='$d_poll'
 d_portable='$d_portable'
 d_procselfexe='$d_procselfexe'
 d_pthread_atfork='$d_pthread_atfork'
+d_pthread_attr_setscope='$d_pthread_attr_setscope'
 d_pthread_yield='$d_pthread_yield'
 d_pwage='$d_pwage'
 d_pwchange='$d_pwchange'
@@ -17206,7 +21200,10 @@ d_pwpasswd='$d_pwpasswd'
 d_pwquota='$d_pwquota'
 d_qgcvt='$d_qgcvt'
 d_quad='$d_quad'
+d_random_r='$d_random_r'
+d_readdir64_r='$d_readdir64_r'
 d_readdir='$d_readdir'
+d_readdir_r='$d_readdir_r'
 d_readlink='$d_readlink'
 d_readv='$d_readv'
 d_recvmsg='$d_recvmsg'
@@ -17217,6 +21214,7 @@ d_safebcpy='$d_safebcpy'
 d_safemcpy='$d_safemcpy'
 d_sanemcmp='$d_sanemcmp'
 d_sbrkproto='$d_sbrkproto'
+d_scalbnl='$d_scalbnl'
 d_sched_yield='$d_sched_yield'
 d_scm_rights='$d_scm_rights'
 d_seekdir='$d_seekdir'
@@ -17231,19 +21229,25 @@ d_sendmsg='$d_sendmsg'
 d_setegid='$d_setegid'
 d_seteuid='$d_seteuid'
 d_setgrent='$d_setgrent'
+d_setgrent_r='$d_setgrent_r'
 d_setgrps='$d_setgrps'
 d_sethent='$d_sethent'
+d_sethostent_r='$d_sethostent_r'
 d_setitimer='$d_setitimer'
 d_setlinebuf='$d_setlinebuf'
 d_setlocale='$d_setlocale'
+d_setlocale_r='$d_setlocale_r'
 d_setnent='$d_setnent'
+d_setnetent_r='$d_setnetent_r'
 d_setpent='$d_setpent'
 d_setpgid='$d_setpgid'
 d_setpgrp2='$d_setpgrp2'
 d_setpgrp='$d_setpgrp'
 d_setprior='$d_setprior'
 d_setproctitle='$d_setproctitle'
+d_setprotoent_r='$d_setprotoent_r'
 d_setpwent='$d_setpwent'
+d_setpwent_r='$d_setpwent_r'
 d_setregid='$d_setregid'
 d_setresgid='$d_setresgid'
 d_setresuid='$d_setresuid'
@@ -17251,6 +21255,7 @@ d_setreuid='$d_setreuid'
 d_setrgid='$d_setrgid'
 d_setruid='$d_setruid'
 d_setsent='$d_setsent'
+d_setservent_r='$d_setservent_r'
 d_setsid='$d_setsid'
 d_setvbuf='$d_setvbuf'
 d_sfio='$d_sfio'
@@ -17270,6 +21275,8 @@ d_socklen_t='$d_socklen_t'
 d_sockpair='$d_sockpair'
 d_socks5_init='$d_socks5_init'
 d_sqrtl='$d_sqrtl'
+d_srand48_r='$d_srand48_r'
+d_srandom_r='$d_srandom_r'
 d_sresgproto='$d_sresgproto'
 d_sresuproto='$d_sresuproto'
 d_statblks='$d_statblks'
@@ -17288,7 +21295,10 @@ d_strcoll='$d_strcoll'
 d_strctcpy='$d_strctcpy'
 d_strerrm='$d_strerrm'
 d_strerror='$d_strerror'
+d_strerror_r='$d_strerror_r'
 d_strftime='$d_strftime'
+d_strlcat='$d_strlcat'
+d_strlcpy='$d_strlcpy'
 d_strtod='$d_strtod'
 d_strtol='$d_strtol'
 d_strtold='$d_strtold'
@@ -17312,7 +21322,11 @@ d_telldir='$d_telldir'
 d_telldirproto='$d_telldirproto'
 d_time='$d_time'
 d_times='$d_times'
+d_tm_tm_gmtoff='$d_tm_tm_gmtoff'
+d_tm_tm_zone='$d_tm_tm_zone'
+d_tmpnam_r='$d_tmpnam_r'
 d_truncate='$d_truncate'
+d_ttyname_r='$d_ttyname_r'
 d_tzname='$d_tzname'
 d_u32align='$d_u32align'
 d_ualarm='$d_ualarm'
@@ -17320,12 +21334,14 @@ d_umask='$d_umask'
 d_uname='$d_uname'
 d_union_semun='$d_union_semun'
 d_unordered='$d_unordered'
+d_unsetenv='$d_unsetenv'
 d_usleep='$d_usleep'
 d_usleepproto='$d_usleepproto'
 d_ustat='$d_ustat'
 d_vendorarch='$d_vendorarch'
 d_vendorbin='$d_vendorbin'
 d_vendorlib='$d_vendorlib'
+d_vendorscript='$d_vendorscript'
 d_vfork='$d_vfork'
 d_void_closedir='$d_void_closedir'
 d_voidsig='$d_voidsig'
@@ -17350,12 +21366,19 @@ dlext='$dlext'
 dlsrc='$dlsrc'
 doublesize='$doublesize'
 drand01='$drand01'
+drand48_r_proto='$drand48_r_proto'
 dynamic_ext='$dynamic_ext'
 eagain='$eagain'
 ebcdic='$ebcdic'
 echo='$echo'
 egrep='$egrep'
 emacs='$emacs'
+endgrent_r_proto='$endgrent_r_proto'
+endhostent_r_proto='$endhostent_r_proto'
+endnetent_r_proto='$endnetent_r_proto'
+endprotoent_r_proto='$endprotoent_r_proto'
+endpwent_r_proto='$endpwent_r_proto'
+endservent_r_proto='$endservent_r_proto'
 eunicefix='$eunicefix'
 exe_ext='$exe_ext'
 expr='$expr'
@@ -17373,14 +21396,37 @@ from='$from'
 full_ar='$full_ar'
 full_csh='$full_csh'
 full_sed='$full_sed'
+gccansipedantic='$gccansipedantic'
 gccosandvers='$gccosandvers'
 gccversion='$gccversion'
+getgrent_r_proto='$getgrent_r_proto'
+getgrgid_r_proto='$getgrgid_r_proto'
+getgrnam_r_proto='$getgrnam_r_proto'
+gethostbyaddr_r_proto='$gethostbyaddr_r_proto'
+gethostbyname_r_proto='$gethostbyname_r_proto'
+gethostent_r_proto='$gethostent_r_proto'
+getlogin_r_proto='$getlogin_r_proto'
+getnetbyaddr_r_proto='$getnetbyaddr_r_proto'
+getnetbyname_r_proto='$getnetbyname_r_proto'
+getnetent_r_proto='$getnetent_r_proto'
+getprotobyname_r_proto='$getprotobyname_r_proto'
+getprotobynumber_r_proto='$getprotobynumber_r_proto'
+getprotoent_r_proto='$getprotoent_r_proto'
+getpwent_r_proto='$getpwent_r_proto'
+getpwnam_r_proto='$getpwnam_r_proto'
+getpwuid_r_proto='$getpwuid_r_proto'
+getservbyname_r_proto='$getservbyname_r_proto'
+getservbyport_r_proto='$getservbyport_r_proto'
+getservent_r_proto='$getservent_r_proto'
+getspnam_r_proto='$getspnam_r_proto'
 gidformat='$gidformat'
 gidsign='$gidsign'
 gidsize='$gidsize'
 gidtype='$gidtype'
 glibpth='$glibpth'
 gmake='$gmake'
+gmtime_r_proto='$gmtime_r_proto'
+gnulibc_version='$gnulibc_version'
 grep='$grep'
 groupcat='$groupcat'
 groupstype='$groupstype'
@@ -17389,6 +21435,10 @@ h_fcntl='$h_fcntl'
 h_sysfile='$h_sysfile'
 hint='$hint'
 hostcat='$hostcat'
+html1dir='$html1dir'
+html1direxp='$html1direxp'
+html3dir='$html3dir'
+html3direxp='$html3direxp'
 i16size='$i16size'
 i16type='$i16type'
 i32size='$i32size'
@@ -17399,6 +21449,7 @@ i8size='$i8size'
 i8type='$i8type'
 i_arpainet='$i_arpainet'
 i_bsdioctl='$i_bsdioctl'
+i_crypt='$i_crypt'
 i_db='$i_db'
 i_dbm='$i_dbm'
 i_dirent='$i_dirent'
@@ -17485,6 +21536,8 @@ incpath='$incpath'
 inews='$inews'
 installarchlib='$installarchlib'
 installbin='$installbin'
+installhtml1dir='$installhtml1dir'
+installhtml3dir='$installhtml3dir'
 installman1dir='$installman1dir'
 installman3dir='$installman3dir'
 installprefix='$installprefix'
@@ -17493,12 +21546,22 @@ installprivlib='$installprivlib'
 installscript='$installscript'
 installsitearch='$installsitearch'
 installsitebin='$installsitebin'
+installsitehtml1dir='$installsitehtml1dir'
+installsitehtml3dir='$installsitehtml3dir'
 installsitelib='$installsitelib'
+installsiteman1dir='$installsiteman1dir'
+installsiteman3dir='$installsiteman3dir'
+installsitescript='$installsitescript'
 installstyle='$installstyle'
 installusrbinperl='$installusrbinperl'
 installvendorarch='$installvendorarch'
 installvendorbin='$installvendorbin'
+installvendorhtml1dir='$installvendorhtml1dir'
+installvendorhtml3dir='$installvendorhtml3dir'
 installvendorlib='$installvendorlib'
+installvendorman1dir='$installvendorman1dir'
+installvendorman3dir='$installvendorman3dir'
+installvendorscript='$installvendorscript'
 intsize='$intsize'
 issymlink='$issymlink'
 ivdformat='$ivdformat'
@@ -17528,6 +21591,7 @@ lint='$lint'
 lkflags='$lkflags'
 ln='$ln'
 lns='$lns'
+localtime_r_proto='$localtime_r_proto'
 locincpth='$locincpth'
 loclibpth='$loclibpth'
 longdblsize='$longdblsize'
@@ -17552,6 +21616,7 @@ man3dir='$man3dir'
 man3direxp='$man3direxp'
 man3ext='$man3ext'
 mips_type='$mips_type'
+mistrustnm='$mistrustnm'
 mkdir='$mkdir'
 mmaptype='$mmaptype'
 modetype='$modetype'
@@ -17576,6 +21641,7 @@ nroff='$nroff'
 nvEUformat='$nvEUformat'
 nvFUformat='$nvFUformat'
 nvGUformat='$nvGUformat'
+nv_preserves_uv_bits='$nv_preserves_uv_bits'
 nveformat='$nveformat'
 nvfformat='$nvfformat'
 nvgformat='$nvgformat'
@@ -17604,7 +21670,6 @@ pg='$pg'
 phostname='$phostname'
 pidtype='$pidtype'
 plibpth='$plibpth'
-pm_apiversion='$pm_apiversion'
 pmake='$pmake'
 pr='$pr'
 prefix='$prefix'
@@ -17618,9 +21683,12 @@ quadkind='$quadkind'
 quadtype='$quadtype'
 randbits='$randbits'
 randfunc='$randfunc'
+random_r_proto='$random_r_proto'
 randseedtype='$randseedtype'
 ranlib='$ranlib'
 rd_nodata='$rd_nodata'
+readdir64_r_proto='$readdir64_r_proto'
+readdir_r_proto='$readdir_r_proto'
 revision='$revision'
 rm='$rm'
 rmail='$rmail'
@@ -17647,6 +21715,13 @@ seedfunc='$seedfunc'
 selectminbits='$selectminbits'
 selecttype='$selecttype'
 sendmail='$sendmail'
+setgrent_r_proto='$setgrent_r_proto'
+sethostent_r_proto='$sethostent_r_proto'
+setlocale_r_proto='$setlocale_r_proto'
+setnetent_r_proto='$setnetent_r_proto'
+setprotoent_r_proto='$setprotoent_r_proto'
+setpwent_r_proto='$setpwent_r_proto'
+setservent_r_proto='$setservent_r_proto'
 sh='$sh'
 shar='$shar'
 sharpbang='$sharpbang'
@@ -17665,11 +21740,21 @@ sitearch='$sitearch'
 sitearchexp='$sitearchexp'
 sitebin='$sitebin'
 sitebinexp='$sitebinexp'
+sitehtml1dir='$sitehtml1dir'
+sitehtml1direxp='$sitehtml1direxp'
+sitehtml3dir='$sitehtml3dir'
+sitehtml3direxp='$sitehtml3direxp'
 sitelib='$sitelib'
 sitelib_stem='$sitelib_stem'
 sitelibexp='$sitelibexp'
+siteman1dir='$siteman1dir'
+siteman1direxp='$siteman1direxp'
+siteman3dir='$siteman3dir'
+siteman3direxp='$siteman3direxp'
 siteprefix='$siteprefix'
 siteprefixexp='$siteprefixexp'
+sitescript='$sitescript'
+sitescriptexp='$sitescriptexp'
 sizesize='$sizesize'
 sizetype='$sizetype'
 sleep='$sleep'
@@ -17681,6 +21766,8 @@ socksizetype='$socksizetype'
 sort='$sort'
 spackage='$spackage'
 spitshell='$spitshell'
+srand48_r_proto='$srand48_r_proto'
+srandom_r_proto='$srandom_r_proto'
 src='$src'
 ssizetype='$ssizetype'
 startperl='$startperl'
@@ -17693,6 +21780,7 @@ stdio_cnt='$stdio_cnt'
 stdio_filbuf='$stdio_filbuf'
 stdio_ptr='$stdio_ptr'
 stdio_stream_array='$stdio_stream_array'
+strerror_r_proto='$strerror_r_proto'
 strings='$strings'
 submit='$submit'
 subversion='$subversion'
@@ -17705,11 +21793,13 @@ tee='$tee'
 test='$test'
 timeincl='$timeincl'
 timetype='$timetype'
+tmpnam_r_proto='$tmpnam_r_proto'
 to='$to'
 touch='$touch'
 tr='$tr'
 trnl='$trnl'
 troff='$troff'
+ttyname_r_proto='$ttyname_r_proto'
 u16size='$u16size'
 u16type='$u16type'
 u32size='$u32size'
@@ -17730,9 +21820,11 @@ use64bitall='$use64bitall'
 use64bitint='$use64bitint'
 usecrosscompile='$usecrosscompile'
 usedl='$usedl'
+usefaststdio='$usefaststdio'
 useithreads='$useithreads'
 uselargefiles='$uselargefiles'
 uselongdouble='$uselongdouble'
+usemallocwrap='$usemallocwrap'
 usemorebits='$usemorebits'
 usemultiplicity='$usemultiplicity'
 usemymalloc='$usemymalloc'
@@ -17741,8 +21833,10 @@ useopcode='$useopcode'
 useperlio='$useperlio'
 useposix='$useposix'
 usereentrant='$usereentrant'
+userelocatableinc='$userelocatableinc'
 usesfio='$usesfio'
 useshrplib='$useshrplib'
+usesitecustomize='$usesitecustomize'
 usesocks='$usesocks'
 usethreads='$usethreads'
 usevendorprefix='$usevendorprefix'
@@ -17759,18 +21853,27 @@ vendorarch='$vendorarch'
 vendorarchexp='$vendorarchexp'
 vendorbin='$vendorbin'
 vendorbinexp='$vendorbinexp'
+vendorhtml1dir='$vendorhtml1dir'
+vendorhtml1direxp='$vendorhtml1direxp'
+vendorhtml3dir='$vendorhtml3dir'
+vendorhtml3direxp='$vendorhtml3direxp'
 vendorlib='$vendorlib'
 vendorlib_stem='$vendorlib_stem'
 vendorlibexp='$vendorlibexp'
+vendorman1dir='$vendorman1dir'
+vendorman1direxp='$vendorman1direxp'
+vendorman3dir='$vendorman3dir'
+vendorman3direxp='$vendorman3direxp'
 vendorprefix='$vendorprefix'
 vendorprefixexp='$vendorprefixexp'
+vendorscript='$vendorscript'
+vendorscriptexp='$vendorscriptexp'
 version='$version'
 version_patchlevel_string='$version_patchlevel_string'
 versiononly='$versiononly'
 vi='$vi'
 voidflags='$voidflags'
 xlibpth='$xlibpth'
-xs_apiversion='$xs_apiversion'
 yacc='$yacc'
 yaccflags='$yaccflags'
 zcat='$zcat'