perl5.005_03 (stock)

1 files changed, 3404 insertions, 1570 deletions

diff --git a/gnu/usr.bin/perl/Configure b/gnu/usr.bin/perl/Configure
index b32c5102afb..5bcdbdaa5c4 100644
--- a/gnu/usr.bin/perl/Configure
+++ b/gnu/usr.bin/perl/Configure
@@ -14,13 +14,14 @@
 # (Note: this Configure script was generated automatically. Rather than
 # working with this copy of Configure, you may wish to get metaconfig.
 # The dist-3.0 package (which contains metaconfig) was posted in
-# comp.sources.misc so you may fetch it yourself from your nearest
-# archive site. Check with Archie if you don't know where that can be.)
+# comp.sources.misc and is available on CPAN under authors/id/RAM so
+# you may fetch it yourself from your nearest archive site.)
 #
 
-# $Id: Head.U,v 3.0.1.8 1995/07/25 13:40:02 ram Exp $
+# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Sat Feb  1 00:26:40 EST 1997 [metaconfig 3.0 PL60]
+# Generated on Tue Jul  7 10:10:21 EDT 1998 [metaconfig 3.0 PL70]
+# (with additional metaconfig patches by jhi@iki.fi)
 
 cat >/tmp/c1$$ <<EOF
 ARGGGHHHH!!!!!
@@ -55,13 +56,17 @@ case "$0" in
 	;;
 esac
 
-: Proper PATH separator
+: 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:/. -a -n "$OS2_SHELL"; then
-	p_=\;
-	PATH=`cmd /c "echo %PATH%" | tr '\\\\' / `
-	OS2_SHELL=`cmd /c "echo %OS2_SHELL%" | tr '\\\\' / | tr '[A-Z]' '[a-z]'`
+if test -d c:/. ; 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]'`
+	elif test -n "$DJGPP"; then
+		p_=\;
+	fi
 fi
 
 : Proper PATH setting
@@ -85,55 +90,65 @@ done
 PATH=.$p_$PATH
 export PATH
 
-: This should not matter in scripts, but apparently it does, sometimes
-case "$CDPATH" in
-'')	;;
-*)	CDPATH='' ;;
-esac
-
-: Sanity checks
-# WRONG: This makes it impossible to compile perl non-interactively
-#if test ! -t 0; then
-#	echo "Say 'sh $me', not 'sh <$me'"
-#	exit 1
-#fi
-
-: Test and see if we are running under ksh, either blatantly or in disguise.
+: shall we be using ksh?
+inksh=''
+needksh=''
+avoidksh=''
+newsh=/bin/ksh
+changesh=''
 if (PATH=.; alias -x) >/dev/null 2>&1; then
-    : running under ksh.  Is this a good thing?
-    if test -d /usr/lpp -a -f /usr/bin/bsh -a -f /usr/bin/uname ; then
-        if test X`/usr/bin/uname -v` = X4 ; then
-            : on AIX 4, /bin/sh is really ksh, and it causes us problems.
-            : Avoid it
-		cat <<'EOM'
-(Feeding myself to /usr/bin/bsh to avoid AIX 4's /bin/sh.)
-EOM
-		unset ENV
-            exec /usr/bin/bsh $0 "$@"
+		inksh=true
+fi
+if test -f /hp-ux -a -f /bin/ksh; then
+	needksh='to avoid sh bug in "here document" expansion'
+fi
+if test -d /usr/lpp -a -f /usr/bin/bsh -a -f /usr/bin/uname; then
+	if test X`/usr/bin/uname -v` = X4; then
+		avoidksh="to avoid AIX 4's /bin/sh"
+		newsh=/usr/bin/bsh
 	fi
-    else
-        if test ! -f /hp-ux ; then
-	: Warn them if they use ksh on other systems
+fi
+case "$inksh/$needksh" in
+/[a-z]*)
+		ENV=''
+		changesh=true
+		reason="$needksh"
+	;;
+esac
+case "$inksh/$avoidksh" in
+true/[a-z]*)
+	changesh=true
+	reason="$avoidksh"
+	;;
+esac
+case "$inksh/$needksh-$avoidksh-" in
+true/--)
 		cat <<EOM
 (I see you are using the Korn shell.  Some ksh's blow up on $me,
-especially on older exotic systems.  If yours does, try the Bourne 
-shell instead.)
+mainly on older exotic systems.  If yours does, try the Bourne shell instead.)
 EOM
-		unset ENV
-        fi
-    fi
-else
-    : Not running under ksh.  Maybe we should be?
-    : On HP-UX, large Configure scripts may exercise a bug in /bin/sh
-    if test -f /hp-ux -a -f /bin/ksh; then
-        cat <<'EOM'
-(Feeding myself to ksh to avoid nasty sh bug in "here document" expansion.)
-EOM
-        unset ENV
-        exec /bin/ksh $0 "$@"
-    fi
-fi
+	;;
+esac
+case "$changesh" in
+true)
+	echo "(Feeding myself to $newsh $reason.)"
+	case "$0" in
+	Configure|*/Configure) exec $newsh $0 "$@";;
+	*) exec $newsh Configure "$@";;
+	esac
+	;;
+esac
 
+: if needed set CDPATH to a harmless value that is not chatty
+: avoid bash 2.02 problems with empty CDPATH.
+case "$CDPATH" in
+'')	;;
+*)	case "$SHELL" in
+	*bash*)	CDPATH='.' ;;
+	*)		CDPATH='' ;;
+	esac
+	;;
+esac
 : Configure runs within the UU subdirectory
 test -d UU || mkdir UU
 cd UU && rm -f ./*
@@ -141,6 +156,7 @@ cd UU && rm -f ./*
 dynamic_ext=''
 extensions=''
 known_extensions=''
+nonxs_ext=''
 static_ext=''
 useopcode=''
 useposix=''
@@ -149,6 +165,8 @@ d_eunice=''
 d_xenix=''
 eunicefix=''
 Mcc=''
+ar=''
+full_ar=''
 awk=''
 bash=''
 bison=''
@@ -170,7 +188,6 @@ emacs=''
 expr=''
 find=''
 flex=''
-gcc=''
 grep=''
 gzip=''
 inews=''
@@ -184,9 +201,11 @@ lpr=''
 ls=''
 mail=''
 mailx=''
+make=''
 mkdir=''
 more=''
 mv=''
+nm=''
 nroff=''
 perl=''
 pg=''
@@ -204,6 +223,7 @@ submit=''
 tail=''
 tar=''
 tbl=''
+tee=''
 test=''
 touch=''
 tr=''
@@ -230,7 +250,9 @@ RCSfile=''
 Revision=''
 Source=''
 State=''
-ar=''
+_a=''
+_exe=''
+_o=''
 archobjs=''
 exe_ext=''
 firstmakefile=''
@@ -239,6 +261,7 @@ obj_ext=''
 path_sep=''
 afs=''
 alignbytes=''
+ansi2knr=''
 archlib=''
 archlibexp=''
 d_archlib=''
@@ -249,8 +272,6 @@ baserev=''
 bin=''
 binexp=''
 installbin=''
-bincompat3=''
-d_bincompat3=''
 byteorder=''
 cc=''
 gccversion=''
@@ -297,6 +318,10 @@ d_dlsymun=''
 d_dosuid=''
 d_suidsafe=''
 d_dup2=''
+d_endhent=''
+d_endnent=''
+d_endpent=''
+d_endsent=''
 d_fchmod=''
 d_fchown=''
 d_fcntl=''
@@ -308,31 +333,58 @@ d_flexfnam=''
 d_flock=''
 d_fork=''
 d_fsetpos=''
+i_sysmount=''
+d_fstatfs=''
+d_statfsflags=''
+i_sysstatvfs=''
+d_fstatvfs=''
+i_mntent=''
+d_getmntent=''
+d_hasmntopt=''
 d_ftime=''
 d_gettimeod=''
 d_Gconvert=''
 d_getgrps=''
-d_setgrps=''
+d_gethbyaddr=''
+d_gethbyname=''
 d_gethent=''
 aphostname=''
 d_gethname=''
 d_phostname=''
 d_uname=''
+d_gethostprotos=''
 d_getlogin=''
+d_getnbyaddr=''
+d_getnbyname=''
+d_getnent=''
+d_getnetprotos=''
+d_getpent=''
 d_getpgid=''
 d_getpgrp2=''
 d_bsdgetpgrp=''
 d_getpgrp=''
 d_getppid=''
 d_getprior=''
+d_getpbyname=''
+d_getpbynumber=''
+d_getprotoprotos=''
+d_getsent=''
+d_getservprotos=''
+d_getsbyname=''
+d_getsbyport=''
 d_gnulibc=''
 d_htonl=''
 d_inetaton=''
 d_isascii=''
 d_killpg=''
+d_lchown=''
 d_link=''
 d_locconv=''
 d_lockf=''
+d_longdbl=''
+longdblsize=''
+d_longlong=''
+longlongsize=''
 d_lstat=''
 d_mblen=''
 d_mbstowcs=''
@@ -357,6 +409,11 @@ d_pause=''
 d_pipe=''
 d_poll=''
 d_portable=''
+d_pthread_yield=''
+d_sched_yield=''
+d_pthreads_created_joinable=''
+i_pthread=''
+i_machcthreads=''
 d_readdir=''
 d_rewinddir=''
 d_seekdir=''
@@ -374,11 +431,14 @@ d_semget=''
 d_semop=''
 d_setegid=''
 d_seteuid=''
+d_setgrps=''
+d_sethent=''
 d_setlinebuf=''
 d_setlocale=''
+d_setnent=''
+d_setpent=''
 d_setpgid=''
 d_setpgrp2=''
-d_bsdpgrp=''
 d_bsdsetpgrp=''
 d_setpgrp=''
 d_setprior=''
@@ -388,7 +448,9 @@ d_setresuid=''
 d_setreuid=''
 d_setrgid=''
 d_setruid=''
+d_setsent=''
 d_setsid=''
+d_setvbuf=''
 d_sfio=''
 usesfio=''
 d_shm=''
@@ -413,6 +475,7 @@ d_stdstdio=''
 stdio_base=''
 stdio_bufsiz=''
 stdio_cnt=''
+stdio_filbuf=''
 stdio_ptr=''
 d_index=''
 d_strchr=''
@@ -439,6 +502,9 @@ d_times=''
 d_truncate=''
 d_tzname=''
 d_umask=''
+d_semctl_semid_ds=''
+d_semctl_semun=''
+d_union_semun=''
 d_vfork=''
 usevfork=''
 d_voidsig=''
@@ -457,6 +523,8 @@ dlsrc=''
 ld=''
 lddlflags=''
 usedl=''
+ebcdic=''
+doublesize=''
 fpostype=''
 gidtype=''
 groupstype=''
@@ -464,6 +532,7 @@ h_fcntl=''
 h_sysfile=''
 db_hashtype=''
 db_prefixtype=''
+i_arpainet=''
 i_db=''
 i_dbm=''
 i_rpcsvcdbm=''
@@ -475,6 +544,10 @@ i_dlfcn=''
 i_fcntl=''
 i_float=''
 i_gdbm=''
+d_grpasswd=''
+d_setgrent=''
+d_getgrent=''
+d_endgrent=''
 i_grp=''
 i_limits=''
 i_locale=''
@@ -482,6 +555,7 @@ i_malloc=''
 i_math=''
 i_memory=''
 i_ndbm=''
+i_netdb=''
 i_neterrno=''
 i_niin=''
 i_sysin=''
@@ -490,7 +564,12 @@ d_pwchange=''
 d_pwclass=''
 d_pwcomment=''
 d_pwexpire=''
+d_pwgecos=''
+d_pwpasswd=''
 d_pwquota=''
+d_setpwent=''
+d_getpwent=''
+d_endpwent=''
 i_pwd=''
 i_sfio=''
 i_stddef=''
@@ -539,10 +618,10 @@ libpth=''
 loclibpth=''
 plibpth=''
 xlibpth=''
+ignore_versioned_solibs=''
 libs=''
 lns=''
 lseektype=''
-make=''
 make_set_make=''
 d_mymalloc=''
 freetype=''
@@ -574,35 +653,43 @@ d_eofnblk=''
 eagain=''
 o_nonblock=''
 rd_nodata=''
+netdb_hlen_type=''
+netdb_host_type=''
+netdb_name_type=''
+netdb_net_type=''
 groupcat=''
 hostcat=''
 passcat=''
-d_oldarchlib=''
-oldarchlib=''
-oldarchlibexp=''
 orderlib=''
 ranlib=''
 package=''
 spackage=''
 pager=''
+apiversion=''
 patchlevel=''
 subversion=''
+version=''
 perladmin=''
 perlpath=''
+pidtype=''
 prefix=''
 prefixexp=''
 installprivlib=''
 privlib=''
 privlibexp=''
 prototype=''
+ptrsize=''
 randbits=''
 installscript=''
 scriptdir=''
 scriptdirexp=''
+selectminbits=''
 selecttype=''
 sh=''
 sig_name=''
+sig_name_init=''
 sig_num=''
+sig_num_init=''
 installsitearch=''
 sitearch=''
 sitearchexp=''
@@ -614,17 +701,21 @@ so=''
 sharpbang=''
 shsharp=''
 spitshell=''
+src=''
 ssizetype=''
 startperl=''
 startsh=''
 stdchar=''
 sysman=''
+trnl=''
 uidtype=''
 nm_opt=''
 nm_so_opt=''
 runnm=''
 usenm=''
 useperlio=''
+d_oldpthreads=''
+usethreads=''
 incpath=''
 mips=''
 mips_type=''
@@ -638,6 +729,12 @@ undef='undef'
 smallmach='pdp11 i8086 z8000 i80286 iAPX286'
 rmlist=''
 
+installusrbinperl=''
+
+ccsymbols=''
+cppsymbols=''
+cppccsymbols=''
+
 : We must find out about Eunice early
 eunicefix=':'
 if test -f /etc/unixtovms; then
@@ -658,7 +755,7 @@ al="$al PWB R3000 RES RISC6000 RT Sun386i SVR3 SVR4"
 al="$al SYSTYPE_BSD SYSTYPE_SVR4 SYSTYPE_SYSV Tek4132 Tek4300"
 al="$al UMAXV USGr4 USGr4_2 UTEK UTS UTek UnicomPBB UnicomPBD Utek"
 al="$al VMS Xenix286"
-al="$al _AIX _AIX32 _AIX370 _AM29000 _COFF _CRAY _CX_UX _EPI"
+al="$al _AIX _AIX32 _AIX370 _AIX41 _AM29000 _COFF _CRAY _CX_UX _EPI _POWER"
 al="$al _IBMESA _IBMR2 _M88K _M88KBCS_TARGET"
 al="$al _MIPSEB _MIPSEL _M_COFF _M_I86 _M_I86SM _M_SYS3"
 al="$al _M_SYS5 _M_SYSIII _M_SYSV _M_UNIX _M_XENIX _NLS _PGC_ _R3000"
@@ -712,26 +809,7 @@ al="$al tower32_800 tower32_850 tss u370 u3b u3b2 u3b20 u3b200"
 al="$al u3b20d u3b5 ultrix unix unixpc unos vax venix vms"
 al="$al xenix z8000"
 
-groupstype=''
 i_whoami=''
-: default library list
-libswanted=''
-: set useposix=false in your hint file to disable the POSIX extension.
-useposix=true
-: set useopcode=false in your hint file to disable the Opcode extension.
-useopcode=true
-: Define several unixisms.  These can be used in hint files.
-exe_ext='' 
-: Extra object files, if any, needed on this platform.
-archobjs=''
-: Possible local include directories to search.
-: Set locincpth to "" in a hint file to defeat local include searches.
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-:
-: no include file wanted by default
-inclwanted=''
-
 : change the next line if compiling for Xenix/286 on Xenix/386
 xlibpth='/usr/lib/386 /lib/386'
 
@@ -740,7 +818,7 @@ loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
 loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
 
 : general looking path for locating libraries
-glibpth="/shlib /usr/shlib /usr/lib/pa1.1 /usr/lib/large"
+glibpth="/shlib /usr/shlib /lib/pa1.1 /usr/lib/large"
 glibpth="$glibpth /lib /usr/lib $xlibpth"
 glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
 glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
@@ -750,11 +828,34 @@ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
 : machines, like the mips.  Usually, it should be empty.
 plibpth=''
 
+: default library list
+libswanted=''
+: some systems want only to use the non-versioned libso:s
+ignore_versioned_solibs=''
+: Possible local include directories to search.
+: Set locincpth to "" in a hint file to defeat local include searches.
+locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
+locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
+:
+: no include file wanted by default
+inclwanted=''
+
+: Trailing extension.  Override this in a hint file, if needed.
+_exe=''
+: Extra object files, if any, needed on this platform.
+archobjs=''
+groupstype=''
 : full support for void wanted by default
 defvoidused=15
 
+: set useposix=false in your hint file to disable the POSIX extension.
+useposix=true
+: set useopcode=false in your hint file to disable the Opcode extension.
+useopcode=true
+: set usethreads on the Configure command line to enable threads.
 : List of libraries we want.
-libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl'
+: If anyone needs -lnet, put it in a hint file.
+libswanted='sfio socket inet nsl nm ndbm gdbm dbm db malloc dl'
 libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
 libswanted="$libswanted ucb bsd BSD PW x"
 : We probably want to search /usr/shlib before most other libraries.
@@ -767,8 +868,6 @@ usevfork=false
 : Find the basic shell for Bourne shell scripts
 case "$sh" in
 '')
-	: SYSTYPE is for some older MIPS systems. 
-	: I do not know if it is still needed.
 	case "$SYSTYPE" in
 	*bsd*|sys5*) xxx="/$SYSTYPE/bin/sh";;
 	*) xxx='/bin/sh';;
@@ -786,11 +885,9 @@ case "$sh" in
 		for xxx in $try; do
 			if test -f "$xxx"; then
 				sh="$xxx";
-				echo "Your Bourne shell appears to be in $sh."
 				break
 			elif test -f "$xxx.exe"; then
 				sh="$xxx";
-				echo "Hmm.  Your Bourne shell appears to be in $sh."
 				break
 			fi
 		done
@@ -801,9 +898,9 @@ esac
 case "$sh" in
 '')	cat <<EOM >&2
 $me:  Fatal Error:  I can't find a Bourne Shell anywhere.  
+
 Usually it's in /bin/sh.  How did you even get this far?
-Please contact me (Chip Salzenberg) at chip@perl.com and 
-we'll try to straigten this all out.
+Please contact perlbug@perl.com and we'll try to straighten this all out.
 EOM
 	exit 1
 	;;
@@ -813,7 +910,6 @@ esac
 if `$sh -c '#' >/dev/null 2>&1`; then
 	shsharp=true
 	spitshell=cat
-	echo " "
 	xcat=/bin/cat
 	test -f $xcat || xcat=/usr/bin/cat
 	echo "#!$xcat" >try
@@ -830,12 +926,11 @@ if `$sh -c '#' >/dev/null 2>&1`; then
 		if test -s today; then
 			sharpbang='#! '
 		else
-			echo "Okay, let's see if #! works on this system..."
-			echo "It's just a comment."
 			sharpbang=': use '
 		fi
 	fi
 else
+	echo " "
 	echo "Your $sh doesn't grok # comments--I will strip them later on."
 	shsharp=false
 	cd ..
@@ -865,59 +960,27 @@ $eunicefix try
 if ./try; then
 	: echo "Yup, it does."
 else
-	echo "Hmm.  '$startsh' didn't work."
-	echo "You may have to fix up the shell scripts to make sure sh runs them."
+	echo "Hmm... '$startsh' does not guarantee sh startup..."
+	echo "You may have to fix up the shell scripts to make sure $sh runs them."
 fi
 rm -f try
 
-: script used to extract .SH files with variable substitutions
-cat >extract <<EOS
-$startsh
-EOS
-cat >>extract <<'EOS'
-CONFIG=true
-echo "Doing variable substitutions on .SH files..."
-if test -f MANIFEST; then
-	shlist=`awk '{print $1}' <MANIFEST | grep '\.SH'`
-	: Pick up possible extension manifests.
-	for dir in ext/* ; do
-		if test -f $dir/MANIFEST; then
-			xxx=`awk '{print $1}' < $dir/MANIFEST | 
-				sed -n "/\.SH$/ s@^@$dir/@p"`
-			shlist="$shlist $xxx"
-		fi
-	done
-	set x $shlist
-else
-	echo "(Looking for .SH files under the current directory.)"
-	set x `find . -name "*.SH" -print`
-fi
-shift
-case $# in
-0) set x *.SH; shift;;
-esac
-if test ! -f $1; then
-	shift
-fi
-for file in $*; do
-	case "$file" in
-	*/*)
-		dir=`expr X$file : 'X\(.*\)/'`
-		file=`expr X$file : 'X.*/\(.*\)'`
-		(cd $dir && . ./$file)
-		;;
-	*)
-		. ./$file
-		;;
-	esac
+
+: Save command line options in file UU/cmdline.opt for later use in
+: generating config.sh.
+cat > cmdline.opt <<EOSH
+# Configure command line arguments.
+config_arg0='$0'
+config_args='$*'
+config_argc=$#
+EOSH
+argn=1
+for arg in "$@"; do
+	cat >>cmdline.opt <<EOSH
+config_arg$argn='$arg'
+EOSH
+	argn=`expr $argn + 1`
 done
-if test -f config_h.SH; then
-	if test ! -f config.h; then
-	: oops, they left it out of MANIFEST, probably, so do it anyway.
-	. ./config_h.SH
-	fi
-fi
-EOS
 
 : produce awk script to parse command line options
 cat >options.awk <<'EOF'
@@ -982,12 +1045,12 @@ silent=''
 extractsh=''
 override=''
 knowitall=''
-
 rm -f optdef.sh
 cat >optdef.sh <<EOS
 $startsh
 EOS
 
+
 : option parsing
 while test $# -gt 0; do
 	case "$1" in
@@ -1006,11 +1069,11 @@ while test $# -gt 0; do
 		shift;;
 	-h) shift; error=true;;
 	-r) shift; reuseval=true;;
-	-s) shift; silent=true;;
+	-s) shift; silent=true; realsilent=true;;
 	-E) shift; alldone=exit;;
 	-K) shift; knowitall=true;;
 	-O) shift; override=true;;
-	-S) shift; extractsh=true;;
+	-S) shift; silent=true; extractsh=true;;
 	-D)
 		shift
 		case "$1" in
@@ -1036,7 +1099,7 @@ while test $# -gt 0; do
 		esac
 		shift
 		;;
-	-V) echo "$me generated by metaconfig 3.0 PL60." >&2
+	-V) echo "$me generated by metaconfig 3.0 PL70." >&2
 		exit 0;;
 	--) break;;
 	-*) echo "$me: unknown option $1" >&2; shift; error=true;;
@@ -1071,6 +1134,17 @@ EOM
 	;;
 esac
 
+: Sanity checks
+case "$fastread$alldone" in
+yescont|yesexit) ;;
+*)
+	if test ! -t 0; then
+		echo "Say 'sh Configure', not 'sh <Configure'"
+		exit 1
+	fi
+	;;
+esac
+
 exec 4>&1
 case "$silent" in
 true) exec 1>/dev/null;;
@@ -1080,26 +1154,6 @@ esac
 touch optdef.sh
 . ./optdef.sh
 
-case "$extractsh" in
-true)
-	case "$config_sh" in
-	'') config_sh='config.sh'; config='./config.sh';;
-	/*) config="$config_sh";;
-	*) config="./$config_sh";;
-	esac
-	echo " "
-	echo "Fetching answers from $config_sh..."
-	cd ..
-	. $config
-	test "$override" && . ./optdef.sh
-	echo " "
-	. ./UU/extract
-	rm -rf UU
-	echo "Done."
-	exit 0
-	;;
-esac
-
 : set package name
 package=perl5
 first=`echo $package | sed -e 's/^\(.\).*/\1/'`
@@ -1109,13 +1163,6 @@ ABYZ) spackage=`echo $first | tr '[:lower:]' '[:upper:]'`$last;;
 *) spackage=`echo $first | tr '[a-z]' '[A-Z]'`$last;;
 esac
 
-: Eunice requires " " instead of "", can you believe it
-echo " "
-: Here we go...
-echo "Beginning of configuration questions for $package."
-
-trap 'echo " "; test -d ../UU && rm -rf X $rmlist; exit 1' 1 2 3 15
-
 : Some greps do not return status, grrr.
 echo "grimblepritz" >grimble
 if grep blurfldyick grimble >/dev/null 2>&1 ; then
@@ -1137,6 +1184,152 @@ EOSS
 chmod +x contains
 esac
 
+: Find the path to the source tree
+case "$src" in
+'') case "$0" in
+    */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`;;
+    *)   src='.';;
+    esac;;
+esac
+case "$src" in
+'')	src=/
+	rsrc=/
+	;;
+/*) rsrc="$src";;
+*) rsrc="../$src";;
+esac
+if test -f $rsrc/Configure && \
+	$contains "^package=$package$" $rsrc/Configure >/dev/null 2>&1
+then
+   : found it, so we are ok.
+else
+	rsrc=''
+	for src in . .. ../.. ../../.. ../../../..; do
+		if test -f ../$src/Configure && \
+			$contains "^package=$package$" ../$src/Configure >/dev/null 2>&1
+		then
+			rsrc=../$src
+			break
+		fi
+	done
+fi
+case "$rsrc" in
+'')
+	cat <<EOM >&4
+
+Sorry, I can't seem to locate the source dir for $package.  Please start
+Configure with an explicit path -- i.e. /some/path/Configure.
+
+EOM
+	exit 1
+	;;
+../.)	rsrc='..';;
+*)
+	echo " "
+	echo "Sources for $package found in \"$src\"." >&4
+	;;
+esac
+
+: script used to extract .SH files with variable substitutions
+cat >extract <<'EOS'
+CONFIG=true
+echo "Doing variable substitutions on .SH files..."
+if test -f $src/MANIFEST; then
+	set x `awk '{print $1}' <$src/MANIFEST | grep '\.SH$'`
+else
+	echo "(Looking for .SH files under the source directory.)"
+	set x `(cd $src; find . -name "*.SH" -print)`
+fi
+shift
+case $# in
+0) set x `(cd $src; echo *.SH)`; shift;;
+esac
+if test ! -f $src/$1; then
+	shift
+fi
+mkdir_p='
+name=$1;
+create="";
+while test $name; do
+	if test ! -d "$name"; then
+		create="$name $create";
+		name=`echo $name | sed -e "s|^[^/]*$||"`;
+		name=`echo $name | sed -e "s|\(.*\)/.*|\1|"`;
+	else
+		name="";
+	fi;
+done;
+for file in $create; do
+	mkdir $file;
+done
+'
+for file in $*; do
+	case "$src" in
+	".")
+		case "$file" in
+		*/*)
+			dir=`expr X$file : 'X\(.*\)/'`
+			file=`expr X$file : 'X.*/\(.*\)'`
+			(cd $dir && . ./$file)
+			;;
+		*)
+			. ./$file
+			;;
+		esac
+		;;
+	*)
+		case "$file" in
+		*/*)
+			dir=`expr X$file : 'X\(.*\)/'`
+			file=`expr X$file : 'X.*/\(.*\)'`
+			(set x $dir; shift; eval $mkdir_p)
+			sh <$src/$dir/$file
+			;;
+		*)
+			sh <$src/$file
+			;;
+		esac
+		;;
+	esac
+done
+if test -f $src/config_h.SH; then
+	if test ! -f config.h; then
+	: oops, they left it out of MANIFEST, probably, so do it anyway.
+	. $src/config_h.SH
+	fi
+fi
+EOS
+
+: extract files and exit if asked to do so
+case "$extractsh" in
+true)
+	case "$realsilent" in
+	true) ;;
+	*) exec 1>&4;;
+	esac
+	case "$config_sh" in
+	'') config_sh='config.sh';;
+	esac
+	echo " "
+	echo "Fetching answers from $config_sh..."
+	cd ..
+	. $config_sh
+	test "$override" && . ./optdef.sh
+	echo " "
+	. UU/extract
+	rm -rf UU
+	echo "Done."
+	exit 0
+	;;
+esac
+
+: Eunice requires " " instead of "", can you believe it
+echo " "
+: Here we go...
+echo "Beginning of configuration questions for $package."
+
+trap 'echo " "; test -d ../UU && rm -rf X $rmlist; exit 1' 1 2 3 15
+
 : first determine how to suppress newline on echo command
 echo " "
 echo "Checking echo to see how to suppress newlines..."
@@ -1158,12 +1351,13 @@ rm -f .echotmp
 
 : Now test for existence of everything in MANIFEST
 echo " "
-if test -f ../MANIFEST; then
+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}' ../MANIFEST | split -50
+	awk '$1 !~ /PACK[A-Z]+/ {print $1}' $rsrc/MANIFEST | split -50
 	rm -f missing
+	tmppwd=`pwd`
 	for filelist in x??; do
-		(cd ..; ls `cat UU/$filelist` >/dev/null 2>>UU/missing)
+		(cd $rsrc; ls `cat $tmppwd/$filelist` >/dev/null 2>>$tmppwd/missing)
 	done
 	if test -s missing; then
 		cat missing >&4
@@ -1174,7 +1368,7 @@ THIS PACKAGE SEEMS TO BE INCOMPLETE.
 You have the option of continuing the configuration process, despite the
 distinct possibility that your kit is damaged, by typing 'y'es.  If you
 do, don't blame me if something goes wrong.  I advise you to type 'n'o
-and contact the author (chip@perl.com).
+and then contact perlbug@perl.com.
 
 EOM
 		echo $n "Continue? [n] $c" >&4
@@ -1190,13 +1384,37 @@ EOM
 			;;
 		esac
 	else
-		echo "Looks good..." >&4
+		echo "Looks good..."
 	fi
 else
 	echo "There is no MANIFEST file.  I hope your kit is complete !"
 fi
 rm -f missing x??
 
+echo " "
+: Find the appropriate value for a newline for tr
+if test -n "$DJGPP"; then
+       trnl='\012'
+fi
+if test X"$trnl" = X; then
+	case "`echo foo|tr '\n' x 2>/dev/null`" in
+	foox) trnl='\n' ;;
+	esac
+fi
+if test X"$trnl" = X; then
+	case "`echo foo|tr '\012' x 2>/dev/null`" in
+	foox) trnl='\012' ;;
+	esac
+fi
+if test X"$trnl" = X; then
+	cat <<EOM >&2
+
+$me: Fatal Error: cannot figure out how to translate newlines with 'tr'.
+
+EOM
+	exit 1
+fi
+
 : compute the number of columns on the terminal for proper question formatting
 case "$COLUMNS" in
 '') COLUMNS='80';;
@@ -1243,8 +1461,20 @@ while expr "X\$ans" : "X!" >/dev/null; do
 	read answ
 	set x \$xxxm
 	shift
-	aok=''; eval ans="\\"\$answ\\"" && aok=y
+	aok=''; eval "ans=\\"\$answ\\"" && aok=y
 	case  "\$answ" in
+	"!")
+		sh 1>&4
+		echo " "
+		$myecho
+		;;
+	!*)
+		set x \`expr "X\$ans" : "X!\(.*\)\$"\`
+		shift
+		sh 1>&4 -c "\$*"
+		echo " "
+		$myecho
+		;;
 	"\$ans")
 		case "\$ans" in
 		\\&*)
@@ -1262,25 +1492,13 @@ while expr "X\$ans" : "X!" >/dev/null; do
 			$myecho
 			ans=!
 			;;
-		"!")
-			sh 1>&4
-			echo " "
-			$myecho
-			;;
-		!*)
-			set x \`expr "X\$ans" : "X!\(.*\)\$"\`
-			shift
-			sh 1>&4 -c "\$*"
-			echo " "
-			$myecho
-			;;
 		esac;;
 	*)
 		case "\$aok" in
 		y)
 			echo "*** Substitution done -- please confirm."
 			xxxm="\$ans"
-			ans=\`echo $n "\$ans$c" | tr '\012' ' '\`
+			ans=\`echo $n "\$ans$c" | tr '$trnl' ' '\`
 			xxxm="\$ans"
 			ans=!
 			;;
@@ -1308,7 +1526,7 @@ EOSC
 test -d ../.config || mkdir ../.config
 cat >../.config/README <<EOF
 This directory created by Configure to save information that should
-persist across sessions.
+persist across sessions for $package.
 
 You may safely delete it if you wish.
 EOF
@@ -1317,8 +1535,8 @@ EOF
 needman=true
 firsttime=true
 user=`(logname) 2>/dev/null`
-case "$user" in "")
-	user=`whoami 2>&1` ;;
+case "$user" in
+'') user=`whoami 2>&1`;;
 esac
 if $contains "^$user\$" ../.config/instruct >/dev/null 2>&1; then
 	firsttime=false
@@ -1333,7 +1551,7 @@ if $contains "^$user\$" ../.config/instruct >/dev/null 2>&1; then
 fi
 if $needman; then
 	cat <<EOH
- 
+
 This installation shell script will examine your system and ask you questions
 to determine how the perl5 package should be installed. If you get
 stuck on a question, you may use a ! shell escape to start a subshell or
@@ -1365,7 +1583,7 @@ If you are in a hurry, you may run 'Configure -d'.  This will bypass nearly all
 the questions and use the computed defaults (or the previous answers if there
 was already a config.sh file). Type 'Configure -h' for a list of options.
 You may also start interactively and then answer '& -d' at any prompt to turn
-on the non-interactive behavior for the remainder of the execution.
+on the non-interactive behaviour for the remainder of the execution.
 
 EOH
 	. ./myread
@@ -1375,7 +1593,7 @@ Much effort has been expended to ensure that this shell script will run on any
 Unix system.  If despite that it blows up on yours, your best bet is to edit
 Configure and run it again.  If you can't run Configure for some reason,
 you'll have to generate a config.sh file by hand.  Whatever problems you
-have, let me (chip@perl.com) know how I blew it.
+have, let perlbug@perl.com know how I blew it.
 
 This installation script affects things in two ways:
 
@@ -1424,8 +1642,12 @@ for dir in \$*; do
 		echo \$thisthing
 		exit 0
 	elif test -f \$dir/\$thing.exe; then
-		: on Eunice apparently
-		echo \$dir/\$thing
+		if test -n "$DJGPP"; then
+			echo \$dir/\$thing.exe
+		else
+			: on Eunice apparently
+			echo \$dir/\$thing
+		fi
 		exit 0
 	fi
 	;;
@@ -1446,6 +1668,7 @@ expr
 find
 grep
 ls
+make
 mkdir
 rm
 sed
@@ -1456,6 +1679,7 @@ uniq
 "
 trylist="
 Mcc
+ar
 byacc
 cpp
 csh
@@ -1466,10 +1690,12 @@ less
 line
 ln
 more
+nm
 nroff
 perl
 pg
 sendmail
+tee
 test
 uname
 zip
@@ -1477,7 +1703,19 @@ zip
 pth=`echo $PATH | sed -e "s/$p_/ /g"`
 pth="$pth /lib /usr/lib"
 for file in $loclist; do
-	xxx=`./loc $file $file $pth`
+	eval xxx=\$$file
+	case "$xxx" in
+	/*|?:[\\/]*)
+		if test -f "$xxx"; then
+			: ok
+		else
+			echo "WARNING: no $xxx -- ignoring your setting for $file." >&4
+			xxx=`./loc $file $file $pth`
+		fi
+		;;
+	'') xxx=`./loc $file $file $pth`;;
+	*) xxx=`./loc $xxx $xxx $pth`;;
+	esac
 	eval $file=$xxx
 	eval _$file=$xxx
 	case "$xxx" in
@@ -1498,7 +1736,19 @@ echo " "
 echo "Don't worry if any of the following aren't found..."
 say=offhand
 for file in $trylist; do
-	xxx=`./loc $file $file $pth`
+	eval xxx=\$$file
+	case "$xxx" in
+	/*|?:[\\/]*)
+		if test -f "$xxx"; then
+			: ok
+		else
+			echo "WARNING: no $xxx -- ignoring your setting for $file." >&4
+			xxx=`./loc $file $file $pth`
+		fi
+		;;
+	'') xxx=`./loc $file $file $pth`;;
+	*) xxx=`./loc $xxx $xxx $pth`;;
+	esac
 	eval $file=$xxx
 	eval _$file=$xxx
 	case "$xxx" in
@@ -1583,17 +1833,59 @@ $rm -f blurfl sym
 
 : see whether [:lower:] and [:upper:] are supported character classes
 echo " "
-up='[A-Z]'
-low='[a-z]'
 case "`echo AbyZ | $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in
 ABYZ)
 	echo "Good, your tr supports [:lower:] and [:upper:] to convert case." >&4
 	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]'
+		;;
+	    esac
+        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'
+		low='a-z'
+		;;
+	    esac
+        fi
+	if test "X$up" = X -o "X$low" = X; then
+	    case "`echo IJ | od -x 2>/dev/null`" in
+	    *C9D1*|*c9d1*)
+		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]'
+			;;
+		    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'
+			;;
+		    esac
+		fi
+		;;
+	    esac
+	fi
+esac
+case "`echo IJ | $tr \"$up\" \"$low\" 2>/dev/null`" in
+ij)
+    echo "Using $up and $low to convert case." >&4
+    ;;
 *)
-	echo "Your tr only supports [a-z] and [A-Z] to convert case." >&4
-	;;
+    echo "I don't know how to translate letters from upper to lower case." >&4
+    echo "Your tr is not acting any way I know of." >&4
+    exit 1
+    ;;
 esac
 : set up the translation script tr, must be called with ./tr of course
 cat >tr <<EOSC
@@ -1611,8 +1903,10 @@ $eunicefix tr
 case "$config_sh" in
 '')
 myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1`
+# tr '[A-Z]' '[a-z]' would not work in EBCDIC
+# because the A-Z/a-z are not consecutive.
 myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \
-	./tr '[A-Z]' '[a-z]' | tr '\012' ' '`
+	./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
 newmyuname="$myuname"
 dflt=n
 case "$knowitall" in
@@ -1659,13 +1953,14 @@ fi
 if test ! -f config.sh; then
 	$cat <<EOM
 
-First time through, eh?  I have some defaults handy for the following systems:
+First time through, eh?  I have some defaults handy for some systems
+that need some extra help getting the Configure answers right:
 
 EOM
-	cd hints; ls -C *.sh | $sed 's/\.sh/   /g' >&4
+	(cd $src/hints; ls -C *.sh) | $sed 's/\.sh/   /g' >&4
 	dflt=''
 	: Half the following guesses are probably wrong... If you have better
-	: tests or hints, please send them to chip@perl.com
+	: tests or hints, please send them to perlbug@perl.com
 	: The metaconfig authors would also appreciate a copy...
 	$test -f /irix && osname=irix
 	$test -f /xenix && osname=sco_xenix
@@ -1680,18 +1975,24 @@ EOM
 	$test -d /usr/apollo/bin && osname=apollo
 	$test -f /etc/saf/_sactab && osname=svr4
 	$test -d /usr/include/minix && osname=minix
-	if $test -d /MachTen; then
-		osname=machten 
+	if $test -d /MachTen -o -d /MachTen_Folder; then
+		osname=machten
 		if $test -x /sbin/version; then
-			osvers=`/sbin/version | $awk '{print $2}' | 
+			osvers=`/sbin/version | $awk '{print $2}' |
 			$sed -e 's/[A-Za-z]$//'`
 		elif $test -x /usr/etc/version; then
-			osvers=`/usr/etc/version | $awk '{print $2}' | 
+			osvers=`/usr/etc/version | $awk '{print $2}' |
 			$sed -e 's/[A-Za-z]$//'`
 		else
 			osvers="$2.$3"
 		fi
 	fi
+	$test -f /sys/posix.dll &&
+		$test -f /usr/bin/what &&
+		set X `/usr/bin/what /sys/posix.dll` &&
+		$test "$3" = UWIN &&
+		osname=uwin &&
+		osvers="$5"
 	if $test -f $uname; then
 		set X $myuname
 		shift
@@ -1706,7 +2007,11 @@ EOM
 		[23]100) osname=mips ;;
 		next*) osname=next ;;
 		i386*)
-			if $test -f /etc/kconfig; then
+			tmp=`/bin/uname -X 2>/dev/null|awk '/3\.2v[45]/{ print $(NF) }'`
+			if $test "$tmp" != "" -a "$3" = "3.2" -a -f '/etc/systemid'; then
+				osname='sco'
+				osvers=$tmp
+			elif $test -f /etc/kconfig; then
 				osname=isc
 				if test "$lns" = "ln -s"; then
 					osvers=4
@@ -1716,6 +2021,13 @@ EOM
 					osvers=2
 				fi
 			fi
+			unset tmp
+			;;
+		pc*)
+			if test -n "$DJGPP"; then
+				osname=dos
+				osvers=djgpp
+			fi
 			;;
 		esac
 
@@ -1743,18 +2055,13 @@ EOM
 			osvers="$3"
 			;;
 		dynixptx*) osname=dynixptx
-			osvers="$3"
+			osvers=`echo "$4" | $sed 's/^v//'`
 			;;
 		freebsd) osname=freebsd 
 			osvers="$3" ;;
 		genix) osname=genix ;;
 		hp*) osname=hpux 
-			case "$3" in
-			*.08.*) osvers=9 ;;
-			*.09.*) osvers=9 ;;
-			*.10.*) osvers=10 ;;
-			*)	osvers="$3" ;;
-			esac
+			osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'`
 			;;
 		irix*) osname=irix
 			case "$3" in
@@ -1768,7 +2075,9 @@ EOM
 			*)	osvers="$3" ;;
 			esac
 			;;
-		netbsd*) osname=netbsd 
+		MiNT) osname=mint
+			;;
+		netbsd*) osname=netbsd
 			osvers="$3"
 			;;
 		news-os) osvers="$3"
@@ -1813,7 +2122,7 @@ EOM
 		osf1|mls+)	case "$5" in
 				alpha)
 					osname=dec_osf
-					osvers=`echo "$3" | sed 's/^[vt]//'`
+					osvers=`echo "$3" | sed 's/^[xvt]//'`
 					;;
 			hp*)	osname=hp_osf1	;;
 			mips)	osname=mips_osf1 ;;
@@ -1854,11 +2163,11 @@ EOM
 			*)	if test -f /etc/systemid; then
 					osname=sco
 					set `echo $3 | $sed 's/\./ /g'` $4
-					if $test -f sco_$1_$2_$3.sh; then
+					if $test -f $src/hints/sco_$1_$2_$3.sh; then
 						osvers=$1.$2.$3
-					elif $test -f sco_$1_$2.sh; then
+					elif $test -f $src/hints/sco_$1_$2.sh; then
 						osvers=$1.$2
-					elif $test -f sco_$1.sh; then
+					elif $test -f $src/hints/sco_$1.sh; then
 						osvers=$1
 					fi
 				else
@@ -1881,12 +2190,12 @@ EOM
 			;;
 		esac
 	else
-		if test -f /vmunix -a -f newsos4.sh; then
-			(what /vmunix | ../UU/tr '[A-Z]' '[a-z]') > ../UU/kernel.what 2>&1
-			if $contains news-os ../UU/kernel.what >/dev/null 2>&1; then
-				osname=newsos4
+		if test -f /vmunix -a -f $src/hints/news_os.sh; then
+			(what /vmunix | UU/tr '[A-Z]' '[a-z]') > UU/kernel.what 2>&1
+			if $contains news-os UU/kernel.what >/dev/null 2>&1; then
+				osname=news_os
 			fi
-			$rm -f ../UU/kernel.what
+			$rm -f UU/kernel.what
 		elif test -d c:/.; then
 			set X $myuname
 			osname=os2
@@ -1909,17 +2218,17 @@ EOM
 		*)  case "$osvers" in
 			'') dflt=$file
 				;;
-			*)  if $test -f $file.sh ; then
+			*)  if $test -f $src/hints/$file.sh ; then
 					dflt=$file
-				elif $test -f $xfile.sh ; then
+				elif $test -f $src/hints/$xfile.sh ; then
 					dflt=$xfile
-				elif $test -f $xxfile.sh ; then
+				elif $test -f $src/hints/$xxfile.sh ; then
 					dflt=$xxfile
-				elif $test -f $xxxfile.sh ; then
+				elif $test -f $src/hints/$xxxfile.sh ; then
 					dflt=$xxxfile
-				elif $test -f $xxxxfile.sh ; then
+				elif $test -f $src/hints/$xxxxfile.sh ; then
 					dflt=$xxxxfile
-				elif $test -f "${osname}.sh" ; then
+				elif $test -f "$src/hints/${osname}.sh" ; then
 					dflt="${osname}"
 				else
 					dflt=none
@@ -1928,25 +2237,46 @@ EOM
 			esac
 			;;
 		esac
+		if $test -f Policy.sh ; then
+			case "$dflt" in
+			*Policy*) ;;
+			none) dflt="Policy" ;;
+			*) dflt="Policy $dflt" ;;
+			esac
+		fi
 		;;
 	*)
 		dflt=`echo $hintfile | $sed 's/\.sh$//'`
 		;;
 	esac
 
+	if $test -f Policy.sh ; then
+		$cat <<EOM
+
+There's also a Policy hint file available, which should make the
+site-specific (policy) questions easier to answer.
+EOM
+
+	fi
+
 	$cat <<EOM
 
 You may give one or more space-separated answers, or "none" if appropriate.
-If your OS version has no hints, DO NOT give a wrong version -- say "none".
+A well-behaved OS will have no hints, so answering "none" or just "Policy"
+is a good thing.  DO NOT give a wrong version.
 
 EOM
+
 	rp="Which of these apply, if any?"
-	. ../UU/myread
+	. UU/myread
 	tans=$ans
 	for file in $tans; do
-		if $test -f $file.sh; then
-			. ./$file.sh
-			$cat $file.sh >> ../UU/config.sh
+		if $test X$file = XPolicy -a -f Policy.sh; then
+			. Policy.sh
+			$cat Policy.sh >> UU/config.sh
+		elif $test -f $src/hints/$file.sh; then
+			. $src/hints/$file.sh
+			$cat $src/hints/$file.sh >> UU/config.sh
 		elif $test X$tans = X -o X$tans = Xnone ; then
 			: nothing
 		else
@@ -1954,11 +2284,11 @@ EOM
 			echo "$file.sh does not exist"
 			dflt=$file
 			rp="hint to use instead?"
-			. ../UU/myread
+			. UU/myread
 			for file in $ans; do
-				if $test -f "$file.sh"; then
-					. ./$file.sh
-					$cat $file.sh >> ../UU/config.sh
+				if $test -f "$src/hints/$file.sh"; then
+					. $src/hints/$file.sh
+					$cat $src/hints/$file.sh >> UU/config.sh
 				elif $test X$ans = X -o X$ans = Xnone ; then
 					: nothing
 				else
@@ -1970,13 +2300,11 @@ EOM
 
 	hint=recommended
 	: Remember our hint file for later.
-	if $test -f "$file.sh" ; then
+	if $test -f "$src/hints/$file.sh" ; then
 		hintfile="$file"
 	else
 		hintfile=''
 	fi
-
-	cd ..
 fi
 cd UU
 ;;
@@ -2049,18 +2377,99 @@ none)  osvers='' ;;
 *) osvers="$ans" ;;
 esac
 
-
-
 : who configured the system
 cf_time=`LC_ALL=C; export LC_ALL; $date 2>&1`
 cf_by=`(logname) 2>/dev/null`
-case "$cf_by" in "")
+case "$cf_by" in
+"")
 	cf_by=`(whoami) 2>/dev/null`
-	case "$cf_by" in "")
-		cf_by=unknown ;;
+	case "$cf_by" in
+	"") cf_by=unknown ;;
 	esac ;;
 esac
 
+: set up the script used to warn in case of inconsistency
+cat <<EOS >whoa
+$startsh
+EOS
+cat <<'EOSC' >>whoa
+dflt=y
+echo " "
+echo "*** WHOA THERE!!! ***" >&4
+echo "    The $hint value for \$$var on this machine was \"$was\"!" >&4
+rp="    Keep the $hint value?"
+. ./myread
+case "$ans" in
+y) td=$was; tu=$was;;
+esac
+EOSC
+
+: function used to set $1 to $val
+setvar='var=$1; eval "was=\$$1"; td=$define; tu=$undef;
+case "$val$was" in
+$define$undef) . ./whoa; eval "$var=\$td";;
+$undef$define) . ./whoa; eval "$var=\$tu";;
+*) eval "$var=$val";;
+esac'
+
+cat <<EOM
+
+Perl can be built to take advantage of threads, on some systems.
+To do so, Configure must 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.
+EOM
+case "$usethreads" in
+$define|true|[yY]*)     dflt='y';;
+*) dflt='n';;
+esac
+rp='Build a threading Perl?'
+. ./myread
+case "$ans" in
+y|Y)    val="$define" ;;     
+*)      val="$undef" ;;
+esac
+set usethreads
+eval $setvar 
+
+case "$d_oldpthreads" in
+'')	: Configure tests would be welcome here.  For now, assume undef.
+	val="$undef" ;;
+*)	val="$d_oldpthreads" ;;
+esac
+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
+		. ./usethreads.cbu
+	fi
+	case "$osname" in
+	aix|dec_osf|dos_djgpp|freebsd|hpux|irix|linux|next|openbsd|os2|solaris|vmesa)
+		# Known thread-capable platforms.
+		;;
+	*)
+	        cat >&4 <<EOM
+$osname is not known to support threads.
+Please let perlbug@perl.com know how to do that.
+
+Cannot continue, aborting.
+EOM
+		exit 1
+	;;
+    	esac # $osname
+    ;;
+esac # $usethreads
+
 : determine the architecture name
 echo " "
 if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then
@@ -2089,9 +2498,20 @@ case "$archname" in
 esac
 rp='What is your architecture name'
 . ./myread
-archname="$ans"
+case "$usethreads" in
+$define)  echo "Threads selected." >&4
+          case "$ans" in
+          *-thread) echo "...and architecture name already ends in -thread." >&4
+                    archname="$ans"
+                    ;;
+          *)        archname="$ans-thread"
+                    echo "...setting architecture name to $archname." >&4
+                    ;;
+          esac
+          ;;
+*)        archname="$ans" ;;
+esac
 myarchname="$tarch"
-
 : is AFS running?
 echo " "
 case "$afs" in
@@ -2104,7 +2524,7 @@ $undef|false)	afs=false ;;
 	fi
 	;;
 esac
-if test $afs = "true"; then
+if $afs; then
 	echo "AFS may be running... I'll be extra cautious then..." >&4
 else
 	echo "AFS does not seem to be running..." >&4
@@ -2173,7 +2593,7 @@ orig_dflt="$dflt"
 
 case "$fn" in
 *\(*)
-	expr $fn : '.*(\(.*\)).*' | tr ',' '\012' >getfile.ok
+	expr $fn : '.*(\(.*\)).*' | tr ',' $trnl >getfile.ok
 	fn=`echo $fn | sed 's/(.*)//'`
 	;;
 esac
@@ -2426,12 +2846,53 @@ prefixit='case "$3" in
 	esac;;
 esac'
 
+: set the base revision
+baserev=5.0
+
+: get the patchlevel
+echo " "
+echo "Getting the current patchlevel..." >&4
+if $test -r $rsrc/patchlevel.h;then
+	patchlevel=`awk '/define[ 	]+PATCHLEVEL/ {print $3}' $rsrc/patchlevel.h`
+	subversion=`awk '/define[ 	]+SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
+else
+	patchlevel=0
+	subversion=0
+fi
+$echo $n "(You have $package" $c
+case "$package" in
+"*$baserev")	;;
+*)		$echo $n " $baserev" $c ;;
+esac
+$echo $n " patchlevel $patchlevel" $c
+test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
+echo ".)"
+
+if test 0 -eq "$subversion"; then
+	version=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel | \
+		 $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
+else
+	version=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel $subversion | \
+		 $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
+fi
+: Figure out perl API version.  Perhaps this should be in patchlevel.h
+if test "$subversion" -lt 50; then
+	apiversion=`LC_ALL=C; export LC_ALL; \
+		 echo $baserev $patchlevel | \
+		 $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
+else
+	apiversion="$version"
+fi
+
 : determine where private library files go
-: Usual default is /usr/local/lib/perl5.  Also allow things like 
-: /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant.
+: Usual default is /usr/local/lib/perl5/$version.
+: Also allow things like /opt/perl/lib/$version, since 
+: /opt/perl/lib/perl5... would be redundant.
 case "$prefix" in
-*perl*) set dflt privlib lib ;;
-*)	 set dflt privlib lib/$package ;;
+*perl*) set dflt privlib lib/$version ;;
+*)	 set dflt privlib lib/$package/$version ;;
 esac
 eval $prefixit
 $cat <<EOM
@@ -2468,28 +2929,6 @@ else
 	installprivlib="$privlibexp"
 fi
 
-: set the base revision
-baserev=5.0
-
-: get the patchlevel
-echo " "
-echo "Getting the current patchlevel..." >&4
-if $test -r ../patchlevel.h;then
-	patchlevel=`awk '/PATCHLEVEL/ {print $3}' ../patchlevel.h`
-	subversion=`awk '/SUBVERSION/ {print $3}' ../patchlevel.h`
-else
-	patchlevel=0
-	subversion=0
-fi
-$echo $n "(You have $package" $c
-case "$package" in
-"*$baserev")	;;
-*)		$echo $n " $baserev" $c ;;
-esac
-$echo $n " patchlevel $patchlevel" $c
-test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
-echo ".)"
-
 : set the prefixup variable, to restore leading tilda escape
 prefixup='case "$prefixexp" in
 "$prefix") ;;
@@ -2499,28 +2938,15 @@ esac'
 : determine where public architecture dependent libraries go
 set archlib archlib
 eval $prefixit
+: privlib default is /usr/local/lib/$package/$version
+: archlib default is /usr/local/lib/$package/$version/$archname
+: privlib may have an optional trailing /share.
+tdflt=`echo $privlib | $sed 's,/share$,,'`
+tdflt=$tdflt/$archname
 case "$archlib" in
-'')
-    case "$privlib" in
-    '')	dflt=`./loc . "." $prefixexp/lib /usr/local/lib /usr/lib /lib`
-	set dflt
-	eval $prefixup
+'')	dflt=$tdflt
 	;;
-    *)	if test 0 -eq "$subversion"; then
-	    version=`LC_ALL=C; export LC_ALL; \
-		     echo $baserev $patchlevel | \
-		     $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
-	else
-	    version=`LC_ALL=C; export LC_ALL; \
-		     echo $baserev $patchlevel $subversion | \
-		     $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
-	fi
-	dflt="$privlib/$archname/$version"
-	;;
-    esac
-    ;;
-*)
-    dflt="$archlib"
+*)	dflt="$archlib"
     ;;
 esac
 cat <<EOM
@@ -2563,57 +2989,6 @@ else
 	d_archlib="$define"
 fi
 
-: set up the script used to warn in case of inconsistency
-cat <<EOS >whoa
-$startsh
-EOS
-cat <<'EOSC' >>whoa
-dflt=y
-echo " "
-echo "*** WHOA THERE!!! ***" >&4
-echo "    The $hint value for \$$var on this machine was \"$was\"!" >&4
-rp="    Keep the $hint value?"
-. ./myread
-case "$ans" in
-y) td=$was; tu=$was;;
-esac
-EOSC
-
-: function used to set $1 to $val
-setvar='var=$1; eval "was=\$$1"; td=$define; tu=$undef;
-case "$val$was" in
-$define$undef) . ./whoa; eval "$var=\$td";;
-$undef$define) . ./whoa; eval "$var=\$tu";;
-*) eval "$var=$val";;
-esac'
-
-$cat <<EOM
-
-Perl 5.004 can be compiled for binary compatibility with 5.003.
-If you decide to do so, you will be able to continue using any
-extensions that were compiled for Perl 5.003.  However, binary
-compatibility forces Perl to expose some of its internal symbols
-in the same way that 5.003 did.  So you may have symbol conflicts
-if you embed a binary-compatible Perl in other programs.
-
-EOM
-case "$d_bincompat3" in
-"$undef") dflt=n ;;
-*) dflt=y ;;
-esac
-rp='Binary compatibility with Perl 5.003?'
-. ./myread
-case "$ans" in
-y*) val="$define" ;;
-*)  val="$undef" ;;
-esac
-set d_bincompat3
-eval $setvar
-case "$d_bincompat3" in
-"$define") bincompat3=y ;;
-*) bincompat3=n ;;
-esac
-
 : make some quick guesses about what we are up against
 echo " "
 $echo $n "Hmm...  $c"
@@ -2816,170 +3191,6 @@ esac
 set d_dosuid
 eval $setvar
 
-: determine where site specific libraries go.
-set sitelib sitelib
-eval $prefixit
-case "$sitelib" in
-'')	dflt="$privlib/site_perl" ;;
-*)	dflt="$sitelib" ;;
-esac
-$cat <<EOM
-
-The installation process will also create a directory for
-site-specific extensions and modules.  Some users find it convenient
-to place all local files in this directory rather than in the main
-distribution directory.
-
-EOM
-fn=d~+
-rp='Pathname for the site-specific library files?'
-. ./getfile
-if $test "X$sitelibexp" != "X$ansexp"; then
-	installsitelib=''
-fi
-sitelib="$ans"
-sitelibexp="$ansexp"
-if $afs; then
-	$cat <<EOM
-
-Since you are running AFS, I need to distinguish the directory in
-which site-specific files reside from the directory in which they are
-installed (and from which they are presumably copied to the former
-directory by occult means).
-
-EOM
-	case "$installsitelib" in
-	'') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;;
-	*) dflt="$installsitelib";;
-	esac
-	fn=de~
-	rp='Where will site-specific files be installed?'
-	. ./getfile
-	installsitelib="$ans"
-else
-	installsitelib="$sitelibexp"
-fi
-
-: determine where site specific architecture-dependent libraries go.
-xxx=`echo $sitelib/$archname | sed 's!^$prefix!!'`
-: xxx is usuually lib/site_perl/archname.
-set sitearch sitearch none
-eval $prefixit
-case "$sitearch" in
-'')	dflt="$sitelib/$archname" ;;
-*)	dflt="$sitearch" ;;
-esac
-$cat <<EOM
-
-The installation process will also create a directory for
-architecture-dependent site-specific extensions and modules.
-
-EOM
-fn=nd~+
-rp='Pathname for the site-specific architecture-dependent library files?'
-. ./getfile
-if $test "X$sitearchexp" != "X$ansexp"; then
-	installsitearch=''
-fi
-sitearch="$ans"
-sitearchexp="$ansexp"
-if $afs; then
-	$cat <<EOM
-
-Since you are running AFS, I need to distinguish the directory in
-which site-specific architecture-dependent library files reside from
-the directory in which they are installed (and from which they are
-presumably copied to the former directory by occult means).
-
-EOM
-	case "$installsitearch" in
-	'') dflt=`echo $sitearchexp | sed 's#^/afs/#/afs/.#'`;;
-	*) dflt="$installsitearch";;
-	esac
-	fn=de~
-	rp='Where will site-specific architecture-dependent files be installed?'
-	. ./getfile
-	installsitearch="$ans"
-else
-	installsitearch="$sitearchexp"
-fi
-
-: determine where old public architecture dependent libraries might be
-case "$oldarchlib" in
-'')	case "$privlib" in
-	'') ;;
-	*)	dflt="$privlib/$archname"
-		;;
-	esac
-	;;
-*)	dflt="$oldarchlib" 
-	;;
-esac
-if $test ! -d "$dflt/auto"; then
-	dflt=none
-fi
-cat <<EOM
-
-In 5.001, Perl stored architecture-dependent library files in a directory
-with a name such as $privlib/$archname, 
-and this directory contained files from the standard extensions and 
-files from any additional extensions you might have added.  Starting 
-with version 5.002, all the architecture-dependent standard extensions 
-will go into a version-specific directory such as
-$archlib, 
-while locally-added extensions will go into
-$sitearch.
-
-If you wish Perl to continue to search the old architecture-dependent
-library for your local extensions, give the path to that directory.
-If you do not wish to use your old architecture-dependent library
-files, answer 'none'.
-
-EOM
-fn=dn~
-rp='Directory for your old 5.001 architecture-dependent libraries?'
-. ./getfile
-oldarchlib="$ans"
-oldarchlibexp="$ansexp"
-case "$oldarchlib" in
-''|' ') val="$undef" ;;
-*) val="$define" ;;
-esac
-set d_oldarchlib
-eval $setvar
-
-: 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"
-if $afs; then
-	$cat <<EOM
-
-Since you are running AFS, I need to distinguish the directory in which
-executables reside from the directory in which they are installed (and from
-which they are presumably copied to the former directory by occult means).
-
-EOM
-	case "$installbin" in
-	'') dflt=`echo $binexp | sed 's#^/afs/#/afs/.#'`;;
-	*) dflt="$installbin";;
-	esac
-	fn=de~
-	rp='Where will public executables be installed?'
-	. ./getfile
-	installbin="$ans"
-else
-	installbin="$binexp"
-fi
-
 : determine where manual pages are on this system
 echo " "
 case "$sysman" in
@@ -3002,7 +3213,7 @@ fi
 case "$models" in
 '')
 	$cat >pdp11.c <<'EOP'
-main() {
+int main() {
 #ifdef pdp11
 	exit(0);
 #else
@@ -3010,7 +3221,7 @@ main() {
 #endif
 }
 EOP
-	(cc -o pdp11 pdp11.c) >/dev/null 2>&1
+	( cc -o pdp11 pdp11.c ) >/dev/null 2>&1
 	if $test -f pdp11 && ./pdp11 2>/dev/null; then
 		dflt='unsplit split'
 	else
@@ -3045,6 +3256,8 @@ put the appropriate flags later when it asks you for other cc and ld flags.
 Venix systems may wish to put "none" and let the compiler figure things out.
 (In the following question multiple model names should be space separated.)
 
+The default for most systems is "none".
+
 EOM
 rp="Which memory models are supported?"
 . ./myread
@@ -3140,6 +3353,7 @@ none)
 	echo "Unrecognized memory models--you may have to edit Makefile.SH" >&4
 	;;
 esac
+$rm -f pdp11.* pdp11
 
 : see if we need a special compiler
 echo " "
@@ -3162,8 +3376,9 @@ if ./usg; then
 		esac;;
 	*)  dflt="$cc";;
 	esac
-	$cat <<'EOM'
-On some systems the default C compiler will not resolve multiple global
+	case "$dflt" in
+	*M*)	$cat <<'EOM'
+On some older systems the default C compiler will not resolve multiple global
 references that happen to have the same name.  On some such systems the "Mcc"
 command may be used to force these to be resolved.  On other systems a "cc -M"
 command is required.  (Note that the -M flag on other systems indicates a
@@ -3171,7 +3386,9 @@ memory model to use!) If you have the Gnu C compiler, you might wish to use
 that instead.
 
 EOM
-	rp="What command will force resolution on this system?"
+	;;
+	esac
+	rp="Use which C compiler?"
 	. ./myread
 	cc="$ans"
 else
@@ -3183,6 +3400,12 @@ else
 	. ./myread
 	cc="$ans"
 fi
+: 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.
+if $test -f cc.cbu; then
+    . ./cc.cbu
+fi
 echo " "
 echo "Checking for GNU cc in disguise and/or its version number..." >&4
 $cat >gccvers.c <<EOM
@@ -3251,13 +3474,13 @@ else
 fi
 chmod +x mips
 $eunicefix mips
-echo " "
 case "$usrinc" in
 '') ;;
 *) dflt="$usrinc";;
 esac
 case "$xxx_prompt" in
 y)	fn=d/
+	echo " "
 	rp='Where are the include files you want to use?'
 	. ./getfile
 	usrinc="$ans"
@@ -3266,6 +3489,148 @@ y)	fn=d/
 	;;
 esac
 
+: see how we invoke the C preprocessor
+echo " "
+echo "Now, how can we feed standard input to your C preprocessor..." >&4
+cat <<'EOT' >testcpp.c
+#define ABC abc
+#define XYZ xyz
+ABC.XYZ
+EOT
+cd ..
+if test ! -f cppstdin; then
+echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >cppstdin
+else
+	echo "Keeping your $hint cppstdin wrapper."
+fi
+chmod 755 cppstdin
+wrapper=`pwd`/cppstdin
+ok='false'
+cd UU
+
+if $test "X$cppstdin" != "X" && \
+	$cppstdin $cppminus <testcpp.c >testcpp.out 2>&1 && \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
+then
+	echo "You used to use $cppstdin $cppminus so we'll use that again."
+	case "$cpprun" in
+	'') echo "But let's see if we can live without a wrapper..." ;;
+	*)
+		if $cpprun $cpplast <testcpp.c >testcpp.out 2>&1 && \
+			$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
+		then
+			echo "(And we'll use $cpprun $cpplast to preprocess directly.)"
+			ok='true'
+		else
+			echo "(However, $cpprun $cpplast does not work, let's see...)"
+		fi
+		;;
+	esac
+else
+	case "$cppstdin" in
+	'') ;;
+	*)
+		echo "Good old $cppstdin $cppminus does not seem to be of any help..."
+		;;
+	esac
+fi
+
+if $ok; then
+	: nothing
+elif echo 'Maybe "'"$cc"' -E" will work...'; \
+	$cc -E <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "Yup, it does."
+	x_cpp="$cc -E"
+	x_minus='';
+elif echo 'Nope...maybe "'"$cc"' -E -" will work...'; \
+	$cc -E - <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "Yup, it does."
+	x_cpp="$cc -E"
+	x_minus='-';
+elif echo 'Nope...maybe "'"$cc"' -P" will work...'; \
+	$cc -P <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "Yipee, that works!"
+	x_cpp="$cc -P"
+	x_minus='';
+elif echo 'Nope...maybe "'"$cc"' -P -" will work...'; \
+	$cc -P - <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "At long last!"
+	x_cpp="$cc -P"
+	x_minus='-';
+elif echo 'No such luck, maybe "'$cpp'" will work...'; \
+	$cpp <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "It works!"
+	x_cpp="$cpp"
+	x_minus='';
+elif echo 'Nixed again...maybe "'$cpp' -" will work...'; \
+	$cpp - <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	echo "Hooray, it works!  I was beginning to wonder."
+	x_cpp="$cpp"
+	x_minus='-';
+elif echo 'Uh-uh.  Time to get fancy.  Trying a wrapper...'; \
+	$wrapper <testcpp.c >testcpp.out 2>&1; \
+	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+	x_cpp="$wrapper"
+	x_minus=''
+	echo "Eureka!"
+else
+	dflt=''
+	rp="No dice.  I can't find a C preprocessor.  Name one:"
+	. ./myread
+	x_cpp="$ans"
+	x_minus=''
+	$x_cpp <testcpp.c >testcpp.out 2>&1
+	if $contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
+		echo "OK, that will do." >&4
+	else
+echo "Sorry, I can't get that to work.  Go find one and rerun Configure." >&4
+		exit 1
+	fi
+fi
+
+case "$ok" in
+false)
+	cppstdin="$x_cpp"
+	cppminus="$x_minus"
+	cpprun="$x_cpp"
+	cpplast="$x_minus"
+	set X $x_cpp
+	shift
+	case "$1" in
+	"$cpp")
+		echo "Perhaps can we force $cc -E using a wrapper..."
+		if $wrapper <testcpp.c >testcpp.out 2>&1; \
+			$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
+		then
+			echo "Yup, we can."
+			cppstdin="$wrapper"
+			cppminus='';
+		else
+			echo "Nope, we'll have to live without it..."
+		fi
+		;;
+	esac
+	case "$cpprun" in
+	"$wrapper")
+		cpprun=''
+		cpplast=''
+		;;
+	esac
+	;;
+esac
+
+case "$cppstdin" in
+"$wrapper"|'cppstdin') ;;
+*) $rm -f $wrapper;;
+esac
+$rm -f testcpp.c testcpp.out
+
 : Set private lib path
 case "$plibpth" in
 '') if ./mips; then
@@ -3312,25 +3677,6 @@ none) libpth=' ';;
 *) libpth="$ans";;
 esac
 
-: Define several unixisms. Hints files or command line options
-: can be used to override them.
-case "$ar" in
-'') ar='ar';;
-esac
-case "$lib_ext" in
-'') lib_ext='.a';;
-esac
-case "$obj_ext" in
-'') obj_ext='.o';;
-esac
-case "$path_sep" in
-'') path_sep=':';;
-esac
-: Which makefile gets called first.  This is used by make depend.
-case "$firstmakefile" in
-'') firstmakefile='makefile';;
-esac
-
 : compute shared library extension
 case "$so" in
 '')
@@ -3353,6 +3699,48 @@ rp='What is the file extension used for shared libraries?'
 . ./myread
 so="$ans"
 
+: Define several unixisms.
+: Hints files or command line option can be used to override them.
+: The convoluted testing is in case hints files set either the old
+: or the new name.
+case "$_exe" in
+'')	case "$exe_ext" in
+    '')	;;
+	*)	_exe="$exe_ext" ;;
+	esac
+	;;
+esac
+case "$_a" in
+'')	case "$lib_ext" in
+    '')	_a='.a';;
+	*)	_a="$lib_ext" ;;
+	esac
+	;;
+esac
+case "$_o" in
+'') case "$obj_ext" in
+	'')	_o='.o';;
+	*)	_o="$obj_ext";;
+	esac
+	;;
+esac
+case "$p_" in
+'') case "$path_sep" in
+	'')	p_=':';;
+	*)	p_="$path_sep";;
+	esac
+	;;
+esac
+exe_ext=$_exe
+lib_ext=$_a
+obj_ext=$_o
+path_sep=$p_
+
+: Which makefile gets called first.  This is used by make depend.
+case "$firstmakefile" in
+'') firstmakefile='makefile';;
+esac
+
 : Looking for optional libraries
 echo " "
 echo "Checking for optional libraries..." >&4
@@ -3365,7 +3753,8 @@ case "$libswanted" in
 esac
 for thislib in $libswanted; do
 	
-	if xxx=`./loc lib$thislib.$so.[0-9]'*' X $libpth`; $test -f "$xxx"; then
+	if xxx=`./loc lib$thislib.$so.[0-9]'*' X $libpth`;
+		$test -f "$xxx" -a "X$ignore_versioned_solibs" = "X"; then
 		echo "Found -l$thislib (shared)."
 		case " $dflt " in
 		*"-l$thislib "*);;
@@ -3377,25 +3766,25 @@ for thislib in $libswanted; do
 		*"-l$thislib "*);;
 		*) dflt="$dflt -l$thislib";;
 		esac
-	elif xxx=`./loc lib$thislib$lib_ext X $libpth`; $test -f "$xxx"; then
+	elif xxx=`./loc lib$thislib$_a X $libpth`; $test -f "$xxx"; then
 		echo "Found -l$thislib."
 		case " $dflt " in
 		*"-l$thislib "*);;
 		*) dflt="$dflt -l$thislib";;
 		esac
-	elif xxx=`./loc $thislib$lib_ext X $libpth`; $test -f "$xxx"; then
+	elif xxx=`./loc $thislib$_a X $libpth`; $test -f "$xxx"; then
 		echo "Found -l$thislib."
 		case " $dflt " in
 		*"-l$thislib "*);;
 		*) dflt="$dflt -l$thislib";;
 		esac
-	elif xxx=`./loc lib${thislib}_s$lib_ext X $libpth`; $test -f "$xxx"; then
+	elif xxx=`./loc lib${thislib}_s$_a X $libpth`; $test -f "$xxx"; then
 		echo "Found -l${thislib}_s."
 		case " $dflt " in
 		*"-l$thislib "*);;
 		*) dflt="$dflt -l${thislib}_s";;
 		esac
-	elif xxx=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$xxx"; then
+	elif xxx=`./loc Slib$thislib$_a X $xlibpth`; $test -f "$xxx"; then
 		echo "Found -l$thislib."
 		case " $dflt " in
 		*"-l$thislib "*);;
@@ -3437,144 +3826,6 @@ none) libs=' ';;
 *) libs="$ans";;
 esac
 
-: see how we invoke the C preprocessor
-echo " "
-echo "Now, how can we feed standard input to your C preprocessor..." >&4
-cat <<'EOT' >testcpp.c
-#define ABC abc
-#define XYZ xyz
-ABC.XYZ
-EOT
-cd ..
-echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >cppstdin
-chmod 755 cppstdin
-wrapper=`pwd`/cppstdin
-ok='false'
-cd UU
-
-if $test "X$cppstdin" != "X" && \
-	$cppstdin $cppminus <testcpp.c >testcpp.out 2>&1 && \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
-then
-	echo "You used to use $cppstdin $cppminus so we'll use that again."
-	case "$cpprun" in
-	'') echo "But let's see if we can live without a wrapper..." ;;
-	*)
-		if $cpprun $cpplast <testcpp.c >testcpp.out 2>&1 && \
-			$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
-		then
-			echo "(And we'll use $cpprun $cpplast to preprocess directly.)"
-			ok='true'
-		else
-			echo "(However, $cpprun $cpplast does not work, let's see...)"
-		fi
-		;;
-	esac
-else
-	case "$cppstdin" in
-	'') ;;
-	*)
-		echo "Good old $cppstdin $cppminus does not seem to be of any help..."
-		;;
-	esac
-fi
-
-if $ok; then
-	: nothing
-elif echo 'Maybe "'"$cc"' -E" will work...'; \
-	$cc -E <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "Yup, it does."
-	x_cpp="$cc -E"
-	x_minus='';
-elif echo 'Nope...maybe "'"$cc"' -E -" will work...'; \
-	$cc -E - <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "Yup, it does."
-	x_cpp="$cc -E"
-	x_minus='-';
-elif echo 'Nope...maybe "'"$cc"' -P" will work...'; \
-	$cc -P <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "Yipee, that works!"
-	x_cpp="$cc -P"
-	x_minus='';
-elif echo 'Nope...maybe "'"$cc"' -P -" will work...'; \
-	$cc -P - <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "At long last!"
-	x_cpp="$cc -P"
-	x_minus='-';
-elif echo 'No such luck, maybe "'$cpp'" will work...'; \
-	$cpp <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "It works!"
-	x_cpp="$cpp"
-	x_minus='';
-elif echo 'Nixed again...maybe "'$cpp' -" will work...'; \
-	$cpp - <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	echo "Hooray, it works!  I was beginning to wonder."
-	x_cpp="$cpp"
-	x_minus='-';
-elif echo 'Uh-uh.  Time to get fancy.  Trying a wrapper...'; \
-	$wrapper <testcpp.c >testcpp.out 2>&1; \
-	$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-	x_cpp="$wrapper"
-	x_minus=''
-	echo "Eureka!"
-else
-	dflt=''
-	rp="No dice.  I can't find a C preprocessor.  Name one:"
-	. ./myread
-	x_cpp="$ans"
-	x_minus=''
-	$x_cpp <testcpp.c >testcpp.out 2>&1
-	if $contains 'abc.*xyz' testcpp.out >/dev/null 2>&1 ; then
-		echo "OK, that will do." >&4
-	else
-echo "Sorry, I can't get that to work.  Go find one and rerun Configure." >&4
-		exit 1
-	fi
-fi
-
-case "$ok" in
-false)
-	cppstdin="$x_cpp"
-	cppminus="$x_minus"
-	cpprun="$x_cpp"
-	cpplast="$x_minus"
-	set X $x_cpp
-	shift
-	case "$1" in
-	"$cpp")
-		echo "Perhaps can we force $cc -E using a wrapper..."
-		if $wrapper <testcpp.c >testcpp.out 2>&1; \
-			$contains 'abc.*xyz' testcpp.out >/dev/null 2>&1
-		then
-			echo "Yup, we can."
-			cppstdin="$wrapper"
-			cppminus='';
-		else
-			echo "Nope, we'll have to live without it..."
-		fi
-		;;
-	esac
-	case "$cpprun" in
-	"$wrapper")
-		cpprun=''
-		cpplast=''
-		;;
-	esac
-	;;
-esac
-
-case "$cppstdin" in
-"$wrapper") ;;
-*) $rm -f $wrapper;;
-esac
-$rm -f testcpp.c testcpp.out
-
 : determine optimize, if desired, or use for debug flag also
 case "$optimize" in
 ' '|$undef) dflt='none';;
@@ -3648,11 +3899,7 @@ if $xxx; then
 	esac;
 fi'
 
-if ./osf1; then
-	set signal.h __LANGUAGE_C__; eval $inctest
-else
-	set signal.h LANGUAGE_C; eval $inctest
-fi
+set signal.h LANGUAGE_C; eval $inctest
 
 case "$hint" in
 none|recommended) dflt="$ccflags $dflt" ;;
@@ -3668,8 +3915,7 @@ Your C compiler may want other flags.  For this question you should include
 -I/whatever and -DWHATEVER flags and any other flags used by the C compiler,
 but you should NOT include libraries or ld flags like -lwhatever.  If you
 want $package to honor its debug switch, you should include -DDEBUGGING here.
-Your C compiler might also need additional flags, such as -D_POSIX_SOURCE,
--DHIDEMYMALLOC or -DCRIPPLED_CC.
+Your C compiler might also need additional flags, such as -D_POSIX_SOURCE.
 
 To use no flags, specify the word "none".
 
@@ -3715,7 +3961,7 @@ EOM
 		esac
 		if $cppstdin -DLFRULB=bar $cppflags $ftry $cppminus <cpp.c \
 			>cpp1.out 2>/dev/null && \
-			$cpprun -DLFRULB=bar $ftry $cpplast <cpp.c \
+			$cpprun -DLFRULB=bar $cppflags $ftry $cpplast <cpp.c \
 			>cpp2.out 2>/dev/null && \
 			$contains 'foo.*xx.*bar' cpp1.out >/dev/null 2>&1 && \
 			$contains 'foo.*xx.*bar' cpp2.out >/dev/null 2>&1
@@ -3737,7 +3983,6 @@ EOM
 esac
 
 : flags used in final linking phase
-
 case "$ldflags" in
 '') if ./venix; then
 		dflt='-i -z'
@@ -3791,11 +4036,22 @@ rmlist="$rmlist pdp11"
 
 : coherency check
 echo " "
-echo "Checking your choice of C compiler, libs, and flags for coherency..." >&4
-set X $cc $optimize $ccflags $ldflags -o try try.c $libs
+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); }
+EOF
+set X $cc $optimize $ccflags -o try $ldflags try.c $libs
 shift
-$cat >try.msg <<EOM
-I've tried to compile and run a simple program with:
+$cat >try.msg <<'EOM'
+I've tried to compile and run the following simple program:
+
+EOM
+$cat try.c >> try.msg
+
+$cat >> try.msg <<EOM
+
+I used the command:
 
 	$*
 	./try
@@ -3803,22 +4059,35 @@ I've tried to compile and run a simple program with:
 and I got the following output:
 
 EOM
-$cat > try.c <<'EOF'
-#include <stdio.h>
-main() { exit(0); }
-EOF
 dflt=y
-if sh -c "$cc $optimize $ccflags -o try try.c $ldflags $libs" >>try.msg 2>&1; then
+if sh -c "$cc $optimize $ccflags -o try $ldflags try.c $libs" >>try.msg 2>&1; then
 	if sh -c './try' >>try.msg 2>&1; then
-		dflt=n
+		xxx=`./try`
+		case "$xxx" in
+		"Ok") dflt=n ;;
+		*)	echo 'The program compiled OK, but produced no output.' >> try.msg
+			case " $libs " in
+			*" -lsfio "*)
+				cat >> try.msg <<'EOQS'
+If $libs contains -lsfio, and sfio is mis-configured, then it
+sometimes (apparently) runs and exits with a 0 status, but with no
+output!  It may have to do with sfio's use of _exit vs. exit.
+
+EOQS
+				rp="You have a big problem.  Shall I abort Configure"
+				dflt=y
+				;;
+			esac
+			;;
+		esac
 	else
 		echo "The program compiled OK, but exited with status $?." >>try.msg
-		rp="You have a problem.  Shall I abort Configure (and explain the problem)"
+		rp="You have a problem.  Shall I abort Configure"
 		dflt=y
 	fi
 else
 	echo "I can't compile the test program." >>try.msg
-	rp="You have a BIG problem.  Shall I abort Configure (and explain the problem)"
+	rp="You have a BIG problem.  Shall I abort Configure"
 	dflt=y
 fi
 case "$dflt" in
@@ -3826,7 +4095,7 @@ y)
 	$cat try.msg >&4
 	case "$knowitall" in
 	'')
-		echo "(The supplied flags might be incorrect with this C compiler.)"
+		echo "(The supplied flags or libraries might be incorrect.)"
 		;;
 	*) dflt=n;;
 	esac
@@ -3843,17 +4112,302 @@ n) echo "OK, that should do.";;
 esac
 $rm -f try try.* core
 
+: determine filename position in cpp output
+echo " "
+echo "Computing filename position in cpp output for #include directives..." >&4
+echo '#include <stdio.h>' > foo.c
+$cat >fieldn <<EOF
+$startsh
+$cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \
+$grep '^[ 	]*#.*stdio\.h' | \
+while read cline; do
+	pos=1
+	set \$cline
+	while $test \$# -gt 0; do
+		if $test -r \`echo \$1 | $tr -d '"'\`; then
+			echo "\$pos"
+			exit 0
+		fi
+		shift
+		pos=\`expr \$pos + 1\`
+	done
+done
+EOF
+chmod +x fieldn
+fieldn=`./fieldn`
+$rm -f foo.c fieldn
+case $fieldn in
+'') pos='???';;
+1) pos=first;;
+2) pos=second;;
+3) pos=third;;
+*) pos="${fieldn}th";;
+esac
+echo "Your cpp writes the filename in the $pos field of the line."
+
+: locate header file
+$cat >findhdr <<EOF
+$startsh
+wanted=\$1
+name=''
+if test -f $usrinc/\$wanted; then
+	echo "$usrinc/\$wanted"
+	exit 0
+fi
+awkprg='{ print \$$fieldn }'
+echo "#include <\$wanted>" > foo\$\$.c
+$cppstdin $cppminus $cppflags < foo\$\$.c 2>/dev/null | \
+$grep "^[ 	]*#.*\$wanted" | \
+while read cline; do
+	name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\`
+	case "\$name" in
+	*/\$wanted) echo "\$name"; exit 0;;
+	*) name='';;
+	esac;
+done;
+$rm -f foo\$\$.c;
+case "\$name" in
+'') exit 1;;
+esac
+EOF
+chmod +x findhdr
+
+: define an alternate in-header-list? function
+inhdr='echo " "; td=$define; tu=$undef; yyy=$@;
+cont=true; xxf="echo \"<\$1> found.\" >&4";
+case $# in 2) xxnf="echo \"<\$1> NOT found.\" >&4";;
+*) xxnf="echo \"<\$1> NOT found, ...\" >&4";;
+esac;
+case $# in 4) instead=instead;; *) instead="at last";; esac;
+while $test "$cont"; do
+	xxx=`./findhdr $1`
+	var=$2; eval "was=\$$2";
+	if $test "$xxx" && $test -r "$xxx";
+	then eval $xxf;
+	eval "case \"\$$var\" in $undef) . ./whoa; esac"; eval "$var=\$td";
+		cont="";
+	else eval $xxnf;
+	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu"; fi;
+	set $yyy; shift; shift; yyy=$@;
+	case $# in 0) cont="";;
+	2) xxf="echo \"but I found <\$1> $instead.\" >&4";
+		xxnf="echo \"and I did not find <\$1> either.\" >&4";;
+	*) xxf="echo \"but I found <\$1\> instead.\" >&4";
+		xxnf="echo \"there is no <\$1>, ...\" >&4";;
+	esac;
+done;
+while $test "$yyy";
+do set $yyy; var=$2; eval "was=\$$2";
+	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu";
+	set $yyy; shift; shift; yyy=$@;
+done'
+
+: 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 which malloc to compile in
+echo " "
+case "$usemymalloc" in
+''|[yY]*|true|$define)	dflt='y' ;;
+*)	dflt='n' ;;
+esac
+rp="Do you wish to attempt to use the malloc that comes with $package?"
+. ./myread
+usemymalloc="$ans"
+case "$ans" in
+y*|true)
+	usemymalloc='y'
+	mallocsrc='malloc.c'
+	mallocobj="malloc$_o"
+	d_mymalloc="$define"
+	case "$libs" in
+	*-lmalloc*)
+		: Remove malloc from list of libraries to use
+		echo "Removing unneeded -lmalloc from library list" >&4
+		set `echo X $libs | $sed -e 's/-lmalloc / /' -e 's/-lmalloc$//'`
+		shift
+		libs="$*"
+		echo "libs = $libs" >&4
+		;;
+	esac
+	;;
+*)
+	usemymalloc='n'
+	mallocsrc=''
+	mallocobj=''
+	d_mymalloc="$undef"
+	;;
+esac
+
+: compute the return types of malloc and free
+echo " "
+$cat >malloc.c <<END
+#$i_malloc I_MALLOC
+#$i_stdlib I_STDLIB
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef I_MALLOC
+#include <malloc.h>
+#endif
+#ifdef I_STDLIB
+#include <stdlib.h>
+#endif
+#ifdef TRY_MALLOC
+void *malloc();
+#endif
+#ifdef TRY_FREE
+void free();
+#endif
+END
+case "$malloctype" in
+'')
+	if $cc $ccflags -c -DTRY_MALLOC malloc.c >/dev/null 2>&1; then
+		malloctype='void *'
+	else
+		malloctype='char *'
+	fi
+	;;
+esac
+echo "Your system wants malloc to return '$malloctype', it would seem." >&4
+
+case "$freetype" in
+'')
+	if $cc $ccflags -c -DTRY_FREE malloc.c >/dev/null 2>&1; then
+		freetype='void'
+	else
+		freetype='int'
+	fi
+	;;
+esac
+echo "Your system uses $freetype free(), it would seem." >&4
+$rm -f malloc.[co]
+: Cruising for prototypes
+echo " "
+echo "Checking out function prototypes..." >&4
+$cat >prototype.c <<'EOCP'
+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"
+if $afs; then
+	$cat <<EOM
+
+Since you are running AFS, I need to distinguish the directory in which
+executables reside from the directory in which they are installed (and from
+which they are presumably copied to the former directory by occult means).
+
+EOM
+	case "$installbin" in
+	'') dflt=`echo $binexp | sed 's#^/afs/#/afs/.#'`;;
+	*) dflt="$installbin";;
+	esac
+	fn=de~
+	rp='Where will public executables be installed?'
+	. ./getfile
+	installbin="$ans"
+else
+	installbin="$binexp"
+fi
+
+echo " "
+if test -d /usr/bin -a "X$installbin" != X/usr/bin; then
+	$cat <<EOM
+Many scripts expect to 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
+
+: define a shorthand compile call
+compile='
+mc_file=$1;
+shift;
+$cc $optimize $ccflags $ldflags -o ${mc_file} $* ${mc_file}.c $libs > /dev/null 2>&1;'
+: define a shorthand compile call for compilations that should be ok.
+compile_ok='
+mc_file=$1;
+shift;
+$cc $optimize $ccflags $ldflags -o ${mc_file} $* ${mc_file}.c $libs;'
+
 echo " "
 echo "Checking for GNU C Library..." >&4
 cat >gnulibc.c <<EOM
-int
-main()
+#include <stdio.h>
+int main()
 {
-  return __libc_main();
+#ifdef __GLIBC__
+    exit(0);
+#else
+    exit(1);
+#endif
 }
 EOM
-if $cc $ccflags $ldflags -o gnulibc gnulibc.c $libs >/dev/null 2>&1 && \
-    ./gnulibc | $contains '^GNU C Library' >/dev/null 2>&1; then
+set gnulibc
+if eval $compile_ok && ./gnulibc; then
 	val="$define"
 	echo "You are using the GNU C Library"
 else
@@ -3867,12 +4421,26 @@ 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)
+	"$define")
+		echo " "
+		echo "nm probably won't work on the GNU C Library." >&4
 		dflt=n
 		;;
-	*)
-		dflt=`egrep 'inlibc|csym' ../Configure | wc -l 2>/dev/null`
+	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
@@ -3883,26 +4451,28 @@ case "$usenm" in
 	;;
 *)
 	case "$usenm" in
-	true) dflt=y;;
+	true|$define) dflt=y;;
 	*) dflt=n;;
 	esac
 	;;
 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 shouldn't let me use 'nm' if you have the GNU C Library.
+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?'
+rp="Shall I use $nm to extract C symbols from the libraries?"
 . ./myread
 case "$ans" in
-n|N) usenm=false;;
+[Nn]*) usenm=false;;
 *) usenm=true;;
 esac
 
@@ -3931,7 +4501,7 @@ esac
 case "$nm_so_opt" in
 '')	case "$myuname" in
 	*linux*)
-		if nm --help | $grep 'dynamic' > /dev/null 2>&1; then
+		if $nm --help | $grep 'dynamic' > /dev/null 2>&1; then
 			nm_so_opt='--dynamic'
 		fi
 		;;
@@ -3946,7 +4516,7 @@ echo " "
 case "$libc" in
 '') libc=unknown
 	case "$libs" in
-	*-lc_s*) libc=`./loc libc_s$lib_ext $libc $libpth`
+	*-lc_s*) libc=`./loc libc_s$_a $libc $libpth`
 	esac
 	;;
 esac
@@ -3964,15 +4534,15 @@ case "$libs" in
 			:
 		elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
 			:
-		elif try=`./loc lib$thislib$lib_ext X $libpth`; $test -f "$try"; then
+		elif try=`./loc lib$thislib$_a X $libpth`; $test -f "$try"; then
 			:
-		elif try=`./loc $thislib$lib_ext 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$lib_ext X $xlibpth`; $test -f "$try"; then
+		elif try=`./loc Slib$thislib$_a X $xlibpth`; $test -f "$try"; then
 			:
 		else
 			try=''
@@ -3993,18 +4563,18 @@ unknown)
 		: The messy sed command sorts on library version numbers.
 		$test -r $1 || \
 			set `echo blurfl; echo $xxx/libc.$so.[0-9]* | \
-				tr ' ' '\012' | egrep -v '\.[A-Za-z]*$' | $sed -e '
+			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/^.* //'`
+			 sort | $sed -e 's/^.* //'`
 		eval set \$$#
 	done
 	$test -r $1 || set /usr/ccs/lib/libc.$so
-  	$test -r $1 || set /lib/libsys_s$lib_ext
-  	;;
+	$test -r $1 || set /lib/libsys_s$_a
+	;;
 *)
 	set blurfl
 	;;
@@ -4022,25 +4592,25 @@ elif $test -r /lib/libc && $test -r /lib/clib; then
 	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$lib_ext; then
-	libc=$incpath/usr/lib/libc$lib_ext;
+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$lib_ext; then
-	libc=/lib/libc$lib_ext;
+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$lib_ext blurfl/dyick $libpth`; $test -r "$tans"; then
+	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$lib_ext blurfl/dyick $xlibpth`; $test -r "$tans"; then
+	elif tans=`./loc Slibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
 		:
-	elif tans=`./loc Mlibc$lib_ext blurfl/dyick $xlibpth`; $test -r "$tans"; then
+	elif tans=`./loc Mlibc$_a blurfl/dyick $xlibpth`; $test -r "$tans"; then
 		:
 	else
-		tans=`./loc Llibc$lib_ext blurfl/dyick $xlibpth`
+		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."
@@ -4059,7 +4629,7 @@ compiler, or your machine supports multiple models), you can override it here.
 EOM
 else
 	dflt=''
-	echo $libpth | tr ' ' '\012' | sort | uniq > libpath
+	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:
 
@@ -4077,7 +4647,7 @@ rp='Where is your C library?'
 libc="$ans"
 
 echo " "
-echo $libc $libnames | tr ' ' '\012' | sort | uniq > libnames
+echo $libc $libnames | tr ' ' $trnl | sort | uniq > libnames
 set X `cat libnames`
 shift
 xxx=files
@@ -4088,15 +4658,12 @@ $sed 's/^/	/' libnames >&4
 echo " "
 $echo $n "This may take a while...$c" >&4
 
-: Linux may need the special Dynamic option to nm for shared libraries.
-: In general, this is stored in the nm_so_opt variable.
-: Unfortunately, that option may be fatal on non-shared libraries.
-for nm_libs_ext in $*; do
-    case $nm_libs_ext in
-	*$so*)	nm $nm_so_opt $nm_opt $nm_libs_ext 2>/dev/null ;;
-	*)		nm $nm_opt $nm_libs_ext 2>/dev/null ;;
+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
+done >libc.tmp
 
 $echo $n ".$c"
 $grep fprintf libc.tmp > libc.ptf
@@ -4156,8 +4723,12 @@ 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
+	$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
@@ -4166,23 +4737,38 @@ else
 		eval $xrun
 	else
 		echo " "
-		echo "nm didn't seem to work right. Trying ar instead..." >&4
+		echo "$nm didn't seem to work right. Trying $ar instead..." >&4
 		com=''
-		if ar t $libc > libc.tmp; then
-			for thisname in $libnames; do
-				ar t $thisname >>libc.tmp
+		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
+			$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 "$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
+			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
+					$sed -e 's/.*\///' -e "s/\\$_o:.*\$//" >>libc.list
+					$ar t $thisname >>libc.tmp
 				done
 				echo "Ok." >&4
 			else
@@ -4196,102 +4782,12 @@ 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$/\1/p' /lib/syscalls.exp >>libc.list
+	$sed -n 's/^\([^ 	]*\)[ 	]*syscall[0-9]*$/\1/p' /lib/syscalls.exp >>libc.list
 fi
 ;;
 esac
 $rm -f libnames libpath
 
-: determine filename position in cpp output
-echo " "
-echo "Computing filename position in cpp output for #include directives..." >&4
-echo '#include <stdio.h>' > foo.c
-$cat >fieldn <<EOF
-$startsh
-$cppstdin $cppflags $cppminus <foo.c 2>/dev/null | \
-$grep '^[ 	]*#.*stdio\.h' | \
-while read cline; do
-	pos=1
-	set \$cline
-	while $test \$# -gt 0; do
-		if $test -r \`echo \$1 | $tr -d '"'\`; then
-			echo "\$pos"
-			exit 0
-		fi
-		shift
-		pos=\`expr \$pos + 1\`
-	done
-done
-EOF
-chmod +x fieldn
-fieldn=`./fieldn`
-$rm -f foo.c fieldn
-case $fieldn in
-'') pos='???';;
-1) pos=first;;
-2) pos=second;;
-3) pos=third;;
-*) pos="${fieldn}th";;
-esac
-echo "Your cpp writes the filename in the $pos field of the line."
-
-: locate header file
-$cat >findhdr <<EOF
-$startsh
-wanted=\$1
-name=''
-if test -f $usrinc/\$wanted; then
-	echo "$usrinc/\$wanted"
-	exit 0
-fi
-awkprg='{ print \$$fieldn }'
-echo "#include <\$wanted>" > foo\$\$.c
-$cppstdin $cppminus $cppflags < foo\$\$.c 2>/dev/null | \
-$grep "^[ 	]*#.*\$wanted" | \
-while read cline; do
-	name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\`
-	case "\$name" in
-	*/\$wanted) echo "\$name"; exit 0;;
-	*) name='';;
-	esac;
-done;
-$rm -f foo\$\$.c;
-case "\$name" in
-'') exit 1;;
-esac
-EOF
-chmod +x findhdr
-
-: define an alternate in-header-list? function
-inhdr='echo " "; td=$define; tu=$undef; yyy=$@;
-cont=true; xxf="echo \"<\$1> found.\" >&4";
-case $# in 2) xxnf="echo \"<\$1> NOT found.\" >&4";;
-*) xxnf="echo \"<\$1> NOT found, ...\" >&4";;
-esac;
-case $# in 4) instead=instead;; *) instead="at last";; esac;
-while $test "$cont"; do
-	xxx=`./findhdr $1`
-	var=$2; eval "was=\$$2";
-	if $test "$xxx" && $test -r "$xxx";
-	then eval $xxf;
-	eval "case \"\$$var\" in $undef) . ./whoa; esac"; eval "$var=\$td";
-		cont="";
-	else eval $xxnf;
-	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu"; fi;
-	set $yyy; shift; shift; yyy=$@;
-	case $# in 0) cont="";;
-	2) xxf="echo \"but I found <\$1> $instead.\" >&4";
-		xxnf="echo \"and I did not find <\$1> either.\" >&4";;
-	*) xxf="echo \"but I found <\$1\> instead.\" >&4";
-		xxnf="echo \"there is no <\$1>, ...\" >&4";;
-	esac;
-done;
-while $test "$yyy";
-do set $yyy; var=$2; eval "was=\$$2";
-	eval "case \"\$$var\" in $define) . ./whoa; esac"; eval "$var=\$tu";
-	set $yyy; shift; shift; yyy=$@;
-done'
-
 : see if dld is available
 set dld.h i_dld
 eval $inhdr
@@ -4317,8 +4813,8 @@ yes)
 		else tval=false;
 		fi;;
 	*)
-		echo "main() { extern short $1$tdc; printf(\"%hd\", $1$tc); }" > t.c;
-		if $cc $ccflags $ldflags -o t t.c $libs >/dev/null 2>&1;
+		echo "int main() { extern short $1$tdc; printf(\"%hd\", $1$tc); }" > t.c;
+		if $cc $optimize $ccflags $ldflags -o t t.c $libs >/dev/null 2>&1;
 		then tval=true;
 		else tval=false;
 		fi;
@@ -4387,7 +4883,7 @@ $undef|n|false)
 	    $define) dflt='y' ;;
 	esac
 	: Does a dl_xxx.xs file exist for this operating system
-	$test -f ../$dldir/dl_${osname}.xs && dflt='y'
+	$test -f $rsrc/$dldir/dl_${osname}.xs && dflt='y'
 	;;
 esac
 rp="Do you wish to use dynamic loading?"
@@ -4397,7 +4893,7 @@ case "$ans" in
 y*) usedl="$define"
 	case "$dlsrc" in
 	'')
-		if $test -f ../$dldir/dl_${osname}.xs ; then
+		if $test -f $rsrc/$dldir/dl_${osname}.xs ; then
 			dflt="$dldir/dl_${osname}.xs"
 		elif $test "$d_dlopen" = "$define" ; then
 			dflt="$dldir/dl_dlopen.xs"
@@ -4412,15 +4908,17 @@ y*) usedl="$define"
 	esac
     echo "The following dynamic loading files are available:"
 	: Can not go over to $dldir because getfile has path hard-coded in.
-    cd ..; ls -C $dldir/dl*.xs; cd UU
-    rp="Source file to use for dynamic loading"
-    fn="fne"
-    . ./getfile
+	tdir=`pwd`; cd $rsrc; $ls -C $dldir/dl*.xs; cd $tdir
+	rp="Source file to use for dynamic loading"
+	fn="fne"
+	# XXX This getfile call will fail the existence check if you try 
+	# building away from $src (this is not supported yet).
+	. ./getfile
 	usedl="$define"
 	: emulate basename
 	dlsrc=`echo $ans | $sed -e 's@.*/\([^/]*\)$@\1@'`
 
-    $cat << EOM
+	$cat << EOM
 
 Some systems may require passing special flags to $cc -c to
 compile modules that will be used to create a shared library.
@@ -4432,20 +4930,18 @@ EOM
 		'') case "$osname" in
 			hpux)	dflt='+z' ;;
 			next)	dflt='none' ;;
-			svr4*|esix*)	dflt='-Kpic' ;;
 			irix*)	dflt='-KPIC' ;;
-			solaris) case "$ccflags" in
-				*-DDEBUGGING*)	dflt='-KPIC' ;;
-				*)		dflt='-Kpic' ;;
-				esac ;;
+			svr4*|esix*|solaris) dflt='-KPIC' ;;
 			sunos)	dflt='-pic' ;;
 			*)	dflt='none' ;;
-		    esac ;;
-		*)  case "$osname/$ccflags" in
-			solaris/*-DDEBUGGING*)	dflt='-fPIC' ;;
-			*)			dflt='-fpic' ;;
+		    esac
+			;;
+		*)  case "$osname" in
+			svr4*|esix*|solaris) dflt='-fPIC' ;;
+			*)	dflt='-fpic' ;;
 		    esac ;;
 	    esac ;;
+	' ') dflt='none' ;;
     *)	dflt="$cccdlflags" ;;
     esac
     rp="Any special flags to pass to $cc -c to compile shared library modules?"
@@ -4466,7 +4962,7 @@ EOM
 /* Test for whether ELF binaries are produced */
 #include <fcntl.h>
 #include <stdlib.h>
-main() {
+int main() {
 	char b[4];
 	int i = open("a.out",O_RDONLY);
 	if(i == -1) 
@@ -4511,6 +5007,7 @@ EOM
 			linux|irix*)	dflt='-shared' ;;
 			next)  dflt='none' ;;
 			solaris) dflt='-G' ;;
+  			beos) dflt='-nostart' ;;
 			sunos) dflt='-assert nodefinitions' ;;
 			svr4*|esix*) dflt="-G $ldflags" ;;
 	        *)     dflt='none' ;;
@@ -4519,21 +5016,25 @@ EOM
     *) dflt="$lddlflags" ;;
     esac
 
-: Try to guess additional flags to pick up local libraries.
-for thisflag in $ldflags; do
-	case "$thisflag" in
-	-L*)
-		case " $dflt " in
-		*" $thisflag "*) ;;
-		*) dflt="$dflt $thisflag" ;;
+	: Try to guess additional flags to pick up local libraries.
+	: Be careful not to append to a plain 'none'
+	case "$dflt" in
+	none) dflt='' ;;
+	esac
+	for thisflag in $ldflags; do
+		case "$thisflag" in
+		-L*)
+			case " $dflt " in
+			*" $thisflag "*) ;;
+			*) dflt="$dflt $thisflag" ;;
+			esac
+			;;
 		esac
-		;;
-	esac
-done
+	done
 
-case "$dflt" in
-'') dflt='none' ;;
-esac
+	case "$dflt" in
+	''|' ') dflt='none' ;;
+	esac
 
     rp="Any special flags to pass to $ld to create a dynamically loaded library?"
     . ./myread
@@ -4557,6 +5058,7 @@ EOM
 		sunos)	dflt='none' ;;
 		*)	dflt='none' ;;
 	    esac ;;
+    ' ')  dflt='none' ;;
     *)  dflt="$ccdlflags" ;;
     esac
     rp="Any special flags to pass to $cc to use dynamic loading?"
@@ -4582,7 +5084,7 @@ $undef)
 	;;
 *)	case "$useshrplib" in
 	'')	case "$osname" in
-		svr4*|dgux|dynixptx|esix|powerux)
+		svr4*|dgux|dynixptx|esix|powerux|beos)
 			dflt=y
 			also='Building a shared libperl is required for dynamic loading to work on your system.'
 			;;
@@ -4595,10 +5097,6 @@ $undef)
 				;;
 			esac
 			;;
-		sunos)
-			dflt=n
-			also='Building a shared libperl will definitely not work on SunOS 4.'
-			;;
 		*)	dflt=n
 			;;
 		esac
@@ -4612,7 +5110,7 @@ $undef)
 	$cat << EOM
 
 The perl executable is normally obtained by linking perlmain.c with
-libperl${lib_ext}, any static extensions (usually just DynaLoader), and
+libperl${_a}, any static extensions (usually just DynaLoader), and
 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
@@ -4630,19 +5128,10 @@ EOM
 		# Why does next4 have to be so different?
 		case "${osname}${osvers}" in
 		next4*)	xxx='DYLD_LIBRARY_PATH' ;;
+		os2*)	xxx='' ;; # Nothing special needed.
+		beos*)  xxx='' ;;
 		*)		xxx='LD_LIBRARY_PATH' ;;
 		esac
-		$cat <<EOM >&4
-
-To build perl, you must add the current working directory to your
-$xxx environtment variable before running make.  You can do
-this with
-   $xxx=\`pwd\`; export $xxx
-for Bourne-style shells, or
-   setenv $xxx \`pwd\`
-for Csh-style shells.  You *MUST* do this before running make.
-
-EOM
 		;;
 	*)	useshrplib='false' ;;
 	esac
@@ -4704,7 +5193,7 @@ EOM
 	echo "Ok, I'll use $libperl"
 	;;
 *)
-	libperl="libperl${lib_ext}"
+	libperl="libperl${_a}"
 	;;
 esac
 
@@ -4714,8 +5203,8 @@ case "$shrpdir" in
 *)	$cat >&4 <<EOM
 WARNING:  Use of the shrpdir variable for the installation location of
 the shared $libperl is not supported.  It was never documented and
-will not work in this version.  Let me (chip@perl.com) know of any
-problems this may cause.
+will not work in this version.  Let perlbug@perl.com
+know of any problems this may cause.
 
 EOM
 	case "$shrpdir" in
@@ -4760,6 +5249,9 @@ if "$useshrplib"; then
 	next)
 		# next doesn't like the default...
 		;;
+	beos)
+		# beos doesn't like the default, either.
+		;;
 	*)
 		tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
 		;;
@@ -4811,14 +5303,6 @@ case "$man1dir" in
 	lookpath="$lookpath $prefixexp/man/p_man/man1"
 	lookpath="$lookpath $prefixexp/man/u_man/man1"
 	lookpath="$lookpath $prefixexp/man/man.1"
-	: If prefix contains 'perl' then we want to keep the man pages
-	: under the prefix directory.  Otherwise, look in a variety of
-	: other possible places.  This is debatable, but probably a
-	: good compromise.  Well, apparently not.
-	: Experience has shown people expect man1dir to be under prefix,
-	: so we now always put it there.  Users who want other behavior
-	: can answer interactively or use a command line option.
-	: Does user have System V-style man paths.
 	case "$sysman" in
 	*/?_man*)	dflt=`./loc . $prefixexp/l_man/man1 $lookpath` ;;
 	*)	dflt=`./loc . $prefixexp/man/man1 $lookpath` ;;
@@ -4947,7 +5431,6 @@ case "$nroff" in
 nroff)
 	$cat <<'EOM'
 However, you don't have nroff, so they're probably useless to you.
-You can use the supplied perldoc script instead.
 EOM
 	case "$man3dir" in
 	'') man3dir="none";;
@@ -4958,7 +5441,6 @@ case "$d_flexfnam" in
 undef)
 	$cat <<'EOM'
 However, your system can't handle the long file names like File::Basename.3. 
-You can use the supplied perldoc script instead.
 EOM
 	case "$man3dir" in
 	'') man3dir="none";;
@@ -4966,14 +5448,10 @@ EOM
 esac
 
 echo "If you don't want the manual sources installed, answer 'none'."
-: We dont use /usr/local/man/man3 because some man programs will
-: only show the /usr/local/man/man3 contents, and not the system ones,
-: thus man less will show the perl module less.pm, but not the system
-: less command.  We might also conflict with TCL man pages.
-: However, something like /opt/perl/man/man3 is fine.
+prog=`echo $package | $sed 's/-*[0-9.]*$//'`
 case "$man3dir" in
 '')	case "$prefix" in 
-	*perl*) dflt=`echo $man1dir | 
+	*$prog*) dflt=`echo $man1dir | 
 			$sed -e 's/man1/man3/g' -e 's/man\.1/man\.3/g'` ;;
 	*)	dflt="$privlib/man/man3" ;;
 	esac
@@ -4984,7 +5462,7 @@ esac
 echo " "
 
 fn=dn+~
-rp="Where do the $spackage library man pages (source) go?"
+rp="Where do the $package library man pages (source) go?"
 . ./getfile
 if test "X$man3direxp" != "X$ansexp"; then
 	installman3dir=''
@@ -5023,7 +5501,7 @@ case "$man3dir" in
 	man3ext='0'
 	;;
 *)
-	rp="What suffix should be used for the $spackage library man pages?"
+	rp="What suffix should be used for the $package library man pages?"
 	case "$man3ext" in
 	'')	case "$man3dir" in
 		*3)  dflt=3 ;;
@@ -5090,6 +5568,15 @@ if $test -d /usr/etc/yp || $test -d /etc/yp; then
 		;;
 	esac
 fi
+case "$hostcat" in
+'') hostcat='cat /etc/hosts';;
+esac
+case "$groupcat" in
+'') groupcat='cat /etc/group';;
+esac
+case "$passcat" in
+'') passcat='cat /etc/passwd';;
+esac
 
 : now get the host name
 echo " "
@@ -5185,15 +5672,11 @@ case "$myhostname" in
 *) case "$mydomain" in
 	'')
 		{
-			: If we use NIS, try ypmatch.
-			: Is there some reason why this was not done before?
 			test "X$hostcat" = "Xypcat hosts" &&
 			ypmatch "$myhostname" hosts 2>/dev/null |\
 				$sed -e 's/[	 ]*#.*//; s/$/ /' > hosts && \
 			$test -s hosts
 		} || {
-			: Extract only the relevant hosts, reducing file size,
-			: remove comments, insert trailing space for later use.
 		     	$hostcat | $sed -n -e "s/[	 ]*#.*//; s/\$/ /
 					/[	 ]$myhostname[	. ]/p" > hosts
 		}
@@ -5215,8 +5698,6 @@ case "$myhostname" in
 			tans=`./loc resolv.conf X /etc /usr/etc`
 			if $test -f "$tans"; then
 				echo "(Attempting domain name extraction from $tans)"
-				: Why was there an Egrep here, when Sed works?
-				: Look for either a search or a domain directive.
 				dflt=.`$sed -n -e 's/	/ /g' \
 				  -e 's/^search  *\([^ ]*\).*/\1/p' $tans \
 				  | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
@@ -5458,15 +5939,107 @@ else
 	installscript="$scriptdirexp"
 fi
 
+: determine where site specific libraries go.
+: Usual default is /usr/local/lib/perl5/site_perl/$apiversion
+prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+case "$prefix" in
+*perl*) set dflt sitelib lib/site_$prog/$apiversion ;;
+*)	 set dflt sitelib lib/$package/site_$prog/$apiversion ;;
+esac
+eval $prefixit
+$cat <<EOM
+
+The installation process will also create a directory for
+site-specific extensions and modules.  Some users find it convenient
+to place all local files in this directory rather than in the main
+distribution directory.
+
+EOM
+fn=d~+
+rp='Pathname for the site-specific library files?'
+. ./getfile
+if $test "X$sitelibexp" != "X$ansexp"; then
+	installsitelib=''
+fi
+sitelib="$ans"
+sitelibexp="$ansexp"
+if $afs; then
+	$cat <<EOM
+
+Since you are running AFS, I need to distinguish the directory in
+which site-specific files reside from the directory in which they are
+installed (and from which they are presumably copied to the former
+directory by occult means).
+
+EOM
+	case "$installsitelib" in
+	'') dflt=`echo $sitelibexp | sed 's#^/afs/#/afs/.#'`;;
+	*) dflt="$installsitelib";;
+	esac
+	fn=de~
+	rp='Where will site-specific files be installed?'
+	. ./getfile
+	installsitelib="$ans"
+else
+	installsitelib="$sitelibexp"
+fi
+
+: determine where site specific architecture-dependent libraries go.
+: sitelib  default is /usr/local/lib/perl5/site_perl/$apiversion
+: sitearch default is /usr/local/lib/perl5/site_perl/$apiversion/$archname
+: sitelib may have an optional trailing /share.
+tdflt=`echo $sitelib | $sed 's,/share$,,'`
+tdflt="$tdflt/$archname"
+set sitearch sitearch none
+eval $prefixit
+case "$sitearch" in
+'')	dflt="$tdflt" ;;
+*)	dflt="$sitearch" ;;
+esac
+$cat <<EOM
+
+The installation process will also create a directory for
+architecture-dependent site-specific extensions and modules.
+
+EOM
+fn=nd~+
+rp='Pathname for the site-specific architecture-dependent library files?'
+. ./getfile
+if $test "X$sitearchexp" != "X$ansexp"; then
+	installsitearch=''
+fi
+sitearch="$ans"
+sitearchexp="$ansexp"
+if $afs; then
+	$cat <<EOM
+
+Since you are running AFS, I need to distinguish the directory in
+which site-specific architecture-dependent library files reside from
+the directory in which they are installed (and from which they are
+presumably copied to the former directory by occult means).
+
+EOM
+	case "$installsitearch" in
+	'') dflt=`echo $sitearchexp | sed 's#^/afs/#/afs/.#'`;;
+	*) dflt="$installsitearch";;
+	esac
+	fn=de~
+	rp='Where will site-specific architecture-dependent files be installed?'
+	. ./getfile
+	installsitearch="$ans"
+else
+	installsitearch="$sitearchexp"
+fi
+
 cat <<EOM
 
-Previous version of $package used the standard IO mechanisms as defined in
-<stdio.h>.  Versions 5.003_02 and later of perl allow alternate IO
+Previous version of $package used the standard IO mechanisms as defined
+in <stdio.h>.  Versions 5.003_02 and later of perl allow alternate IO
 mechanisms via a "PerlIO" abstraction, but the stdio mechanism is still
-the default and is the only supported mechanism.  This abstraction
-layer can use AT&T's sfio (if you already have sfio installed) or
-fall back on standard IO.  This PerlIO abstraction layer is
-experimental and may cause problems with some extension modules.
+the default.  This 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.  Using PerlIO with stdio is safe,
+but it is slower than plain stdio and therefore is not the default.
 
 If this doesn't make any sense to you, just accept the default 'n'.
 EOM
@@ -5489,9 +6062,10 @@ set useperlio
 eval $setvar 
 
 : Check how to convert floats to strings.
-echo " "
-echo "Checking for an efficient way to convert floats to strings."
-$cat >try.c <<'EOP'
+if test "X$d_Gconvert" = X; then
+    echo " "
+    echo "Checking for an efficient way to convert floats to strings."
+    $cat >try.c <<'EOP'
 #ifdef TRY_gconvert
 #define Gconvert(x,n,t,b) gconvert((x),(n),(t),(b))
 char *myname = "gconvert";
@@ -5519,8 +6093,7 @@ char *got;
 	}
 }
 
-int
-main()
+int main()
 { 
 	char buf[64]; 
 	buf[63] = '\0';
@@ -5550,18 +6123,18 @@ main()
 	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_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
 
-for xxx_convert in $xxx_list; do
+    for xxx_convert in $xxx_list; do
 	echo "Trying $xxx_convert"
-	$rm -f try try.o
-	if $cc $ccflags -DTRY_$xxx_convert $ldflags -o try \
-		try.c $libs > /dev/null 2>&1 ; then
+	$rm -f try try$_o
+	set try -DTRY_$xxx_convert
+	if eval $compile; then
 		echo "$xxx_convert" found. >&4
 		if ./try; then
 			echo "I'll use $xxx_convert to convert floats into a string." >&4
@@ -5572,13 +6145,14 @@ for xxx_convert in $xxx_list; do
 	else
 		echo "$xxx_convert NOT found." >&4
 	fi
-done
+    done
 		
-case "$xxx_convert" in
-gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
-gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
-*) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
-esac
+    case "$xxx_convert" in
+    gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
+    gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
+    *) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
+    esac
+fi
 
 : Initialize h_fcntl
 h_fcntl=false
@@ -5605,21 +6179,21 @@ case "$d_access" in
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-main() {
+int main() {
 	exit(R_OK);
 }
 EOCP
 	: check sys/file.h first, no particular reason here
 	if $test `./findhdr sys/file.h` && \
-		$cc $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then
+		$cc $cppflags -DI_SYS_FILE -o access access.c >/dev/null 2>&1 ; then
 		h_sysfile=true;
 		echo "<sys/file.h> defines the *_OK access constants." >&4
 	elif $test `./findhdr fcntl.h` && \
-		$cc $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then
+		$cc $cppflags -DI_FCNTL -o access access.c >/dev/null 2>&1 ; then
 		h_fcntl=true;
 		echo "<fcntl.h> defines the *_OK access constants." >&4
 	elif $test `./findhdr unistd.h` && \
-		$cc $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then
+		$cc $cppflags -DI_UNISTD -o access access.c >/dev/null 2>&1 ; then
 		echo "<unistd.h> defines the *_OK access constants." >&4
 	else
 		echo "I can't find the four *_OK access constants--I'll use mine." >&4
@@ -5671,17 +6245,17 @@ eval $inhdr
 set getpgrp d_getpgrp
 eval $inlibc
 
-echo "Checking to see which flavor of getpgrp is in use . . . "
 case "$d_getpgrp" in
 "$define")
 	echo " "
+	echo "Checking to see which flavor of getpgrp is in use..."
 	$cat >set.c <<EOP
 #$i_unistd I_UNISTD
 #include <sys/types.h>
 #ifdef I_UNISTD
 #  include <unistd.h>
 #endif
-main()
+int main()
 {
 	if (getuid() == 0) {
 		printf("(I see you are running Configure as super-user...)\n");
@@ -5733,17 +6307,17 @@ $rm -f set set.c
 set setpgrp d_setpgrp
 eval $inlibc
 
-echo "Checking to see which flavor of setpgrp is in use . . . "
 case "$d_setpgrp" in
 "$define")
 	echo " "
+	echo "Checking to see which flavor of setpgrp is in use..."
 	$cat >set.c <<EOP
 #$i_unistd I_UNISTD
 #include <sys/types.h>
 #ifdef I_UNISTD
 #  include <unistd.h>
 #endif
-main()
+int main()
 {
 	if (getuid() == 0) {
 		printf("(I see you are running Configure as super-user...)\n");
@@ -5766,7 +6340,7 @@ EOP
 		echo 'You have to use setpgrp() instead of setpgrp(pid,pgrp).' >&4
 		val="$undef"
 	else
-		echo "I can't seem to compile and run the test program."
+		echo "(I can't seem to compile and run the test program.)"
 		if ./usg; then
 			xxx="a USG one, i.e. you use setpgrp()."
 		else
@@ -5789,7 +6363,6 @@ EOP
 esac
 set d_bsdsetpgrp
 eval $setvar
-d_bsdpgrp=$d_bsdsetpgrp
 $rm -f set set.c
 : see if bzero exists
 set bzero d_bzero
@@ -5802,33 +6375,27 @@ case "$intsize" in
 	echo "Checking to see how big your integers are..." >&4
 	$cat >intsize.c <<'EOCP'
 #include <stdio.h>
-main()
+int main()
 {
 	printf("intsize=%d;\n", sizeof(int));
 	printf("longsize=%d;\n", sizeof(long));
 	printf("shortsize=%d;\n", sizeof(short));
-	fflush(stdout);
 	exit(0);
 }
 EOCP
-#	If $libs contains -lsfio, and sfio is mis-configured, then it
-#	sometimes (apparently) runs and exits with a 0 status, but with no
-#	output!.  Thus we check with test -s whether we actually got any 
-#	output.  I think it has to do with sfio's use of _exit vs. exit,
-#	but I don't know for sure.  --Andy Dougherty  1/27/97.
-	if $cc $optimize $ccflags $ldflags -o intsize intsize.c $libs >/dev/null 2>&1 && 
-	./intsize > intsize.out 2>/dev/null && test -s intsize.out ; then
-		eval `$cat intsize.out`
+	set intsize
+	if eval $compile_ok && ./intsize > /dev/null; then
+		eval `./intsize`
 		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)?"
@@ -5845,7 +6412,7 @@ EOM
 	fi
 	;;
 esac
-$rm -f intsize intsize.[co] intsize.out
+$rm -f intsize intsize.*
 
 : see if signal is declared as pointer to function returning int or void
 echo " "
@@ -5855,11 +6422,14 @@ if $contains 'int.*\*[ 	]*signal' $$.tmp >/dev/null 2>&1 ; then
 	echo "You have int (*signal())() instead of void." >&4
 	val="$undef"
 elif $contains 'void.*\*[ 	]*signal' $$.tmp >/dev/null 2>&1 ; then
-	echo "You have void (*signal())() instead of int." >&4
+	echo "You have void (*signal())()." >&4
 	val="$define"
 elif $contains 'extern[ 	]*[(\*]*signal' $$.tmp >/dev/null 2>&1 ; then
 	echo "You have int (*signal())() instead of void." >&4
 	val="$undef"
+elif $contains 'void.*\*.*sig' $$.tmp >/dev/null 2>&1 ; then
+	echo "You have void (*signal())()." >&4
+	val="$define"
 else
 	case "$d_voidsig" in
 	'')
@@ -5872,9 +6442,12 @@ else
 		*) val="$undef";;
 		esac;;
 	"$define")
-		echo "As you already told me, signal handler returns void." >&4;;
-	*)
-		echo "As you already told me, signal handler returns int." >&4;;
+		echo "As you already told me, signal handler returns void." >&4
+		val="$define"
+		;;
+	*)	echo "As you already told me, signal handler returns int." >&4
+		val="$undef"
+		;;
 	esac
 fi
 set d_voidsig
@@ -5888,32 +6461,44 @@ $rm -f $$.tmp
 : check for ability to cast large floats to 32-bit ints.
 echo " "
 echo 'Checking whether your C compiler can cast large floats to int32.' >&4
-if $test "$intsize" -eq 4; then
+if $test "$intsize" -ge 4; then
 	xxx=int
 else
 	xxx=long
 fi
 $cat >try.c <<EOCP
+#include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech() { exit(3); }
-main()
+$signal_t blech(s) int s; { exit(3); }
+int main()
 {
 	$xxx i32;
-	double f;
+	double f, g;
 	int result = 0;
+	char str[16];
 	signal(SIGFPE, blech);
 
-	f = (double) 0x7fffffff;
-	f = 10 * f;
-	i32  = ($xxx) f;
-
+	/* Don't let compiler optimize the test away.  Store the number 
+	   in a writable string for gcc to pass to sscanf under HP/UX.
+	*/
+	sprintf(str, "2147483647");
+	sscanf(str, "%lf", &f); /* f = (double) 0x7fffffff; */
+	g = 10 * f;
+	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
+	   behavior here, which is to preserve the sign and give
+	   back 0x7fff ffff.
+	*/
 	if (i32 != ($xxx) f)
 		result |= 1;
 	exit(result);
 }
 EOCP
-if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+set try
+if eval $compile_ok; then
 	./try
 	yyy=$?
 else
@@ -5936,20 +6521,32 @@ $rm -f try try.*
 echo " "
 echo 'Checking whether your C compiler can cast negative float to unsigned.' >&4
 $cat >try.c <<EOCP
+#include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-$signal_t blech() { exit(7); }
-$signal_t blech_in_list() { exit(4); }
+$signal_t blech(s) int s; { exit(7); }
+$signal_t blech_in_list(s) int s; { exit(4); }
 unsigned long dummy_long(p) unsigned long p; { return p; }
 unsigned int dummy_int(p) unsigned int p; { return p; }
 unsigned short dummy_short(p) unsigned short p; { return p; }
-main()
+int main()
 {
-	double f = -123.;
+	double f;
 	unsigned long along;
 	unsigned int aint;
 	unsigned short ashort;
 	int result = 0;
+	char str[16];
+	
+	/* Frustrate gcc-2.7.2's optimizer which failed this test with
+	   a direct f = -123. assignment.  gcc-2.8.0 reportedly
+	   optimized the whole file away
+	*/
+	/* Store the number in a writable string for gcc to pass to 
+	   sscanf under HP/UX.
+	*/
+	sprintf(str, "-123");
+	sscanf(str, "%lf", &f);  /* f = -123.; */
 
 	signal(SIGFPE, blech);
 	along = (unsigned long)f;
@@ -5961,7 +6558,8 @@ main()
 		result |= 1;
 	if (ashort != (unsigned short)-123)
 		result |= 1;
-	f = (double)0x40000000;
+	sprintf(str, "1073741824.");
+	sscanf(str, "%lf", &f); /* f = (double)0x40000000; */
 	f = f + f;
 	along = 0;
 	along = (unsigned long)f;
@@ -5980,7 +6578,8 @@ main()
 	if (result)
 		exit(result);
 	signal(SIGFPE, blech_in_list);
-	f = 123.;
+	sprintf(str, "123.");
+	sscanf(str, "%lf", &f);  /* f = 123.; */
 	along = dummy_long((unsigned long)f);
 	aint = dummy_int((unsigned int)f);
 	ashort = dummy_short((unsigned short)f);
@@ -5994,7 +6593,8 @@ main()
 
 }
 EOCP
-if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+set try
+if eval $compile_ok; then
 	./try
 	castflags=$?
 else
@@ -6021,7 +6621,7 @@ if set vprintf val -f d_vprintf; eval $csym; $val; then
 	$cat >vprintf.c <<'EOF'
 #include <varargs.h>
 
-main() { xxx("foo"); }
+int main() { xxx("foo"); }
 
 xxx(va_alist)
 va_dcl
@@ -6033,7 +6633,8 @@ va_dcl
 	exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
 }
 EOF
-	if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then
+	set vprintf
+	if eval $compile && ./vprintf; then
 		echo "Your vsprintf() returns (int)." >&4
 		val2="$undef"
 	else
@@ -6068,7 +6669,7 @@ echo " "
 echo 'Checking to see if your C compiler knows about "const"...' >&4
 $cat >const.c <<'EOCP'
 typedef struct spug { int drokk; } spug;
-main()
+int main()
 {
 	const char *foo;
 	const spug y;
@@ -6091,19 +6692,19 @@ if set crypt val -f d_crypt; eval $csym; $val; then
 	val="$define"
 	cryptlib=''
 else
-	cryptlib=`./loc Slibcrypt$lib_ext "" $xlibpth`
+	cryptlib=`./loc Slibcrypt$_a "" $xlibpth`
 	if $test -z "$cryptlib"; then
-		cryptlib=`./loc Mlibcrypt$lib_ext "" $xlibpth`
+		cryptlib=`./loc Mlibcrypt$_a "" $xlibpth`
 	else
 		cryptlib=-lcrypt
 	fi
 	if $test -z "$cryptlib"; then
-		cryptlib=`./loc Llibcrypt$lib_ext "" $xlibpth`
+		cryptlib=`./loc Llibcrypt$_a "" $xlibpth`
 	else
 		cryptlib=-lcrypt
 	fi
 	if $test -z "$cryptlib"; then
-		cryptlib=`./loc libcrypt$lib_ext "" $libpth`
+		cryptlib=`./loc libcrypt$_a "" $libpth`
 	else
 		cryptlib=-lcrypt
 	fi
@@ -6117,18 +6718,6 @@ fi
 set d_crypt
 eval $setvar
 
-: get csh whereabouts
-case "$csh" in
-'csh')	val="$undef" ;;
-*)	val="$define" ;;
-esac
-set d_csh
-eval $setvar
-: Respect a hint or command line value for full_csh.
-case "$full_csh" in
-'') full_csh=$csh ;;
-esac
-
 : see if cuserid exists
 set cuserid d_cuserid
 eval $inlibc
@@ -6172,6 +6761,10 @@ eval $setvar
 set difftime d_difftime
 eval $inlibc
 
+: see if sys/stat.h is available
+set sys/stat.h i_sysstat
+eval $inhdr
+
 : see if this is a dirent system
 echo " "
 if xinc=`./findhdr dirent.h`; $test "$xinc"; then
@@ -6240,6 +6833,23 @@ set d_dirnamlen
 eval $setvar
 $rm -f try.c
 
+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; foo.$field = 0; }" >> try.c;
+if eval $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then
+	val="$define";
+else
+	val="$undef";
+fi;
+set $varname;
+eval $setvar;
+$rm -f try.c try.o'
+
 : see if dlerror exists
 xxx_runnm="$runnm"
 runnm=false
@@ -6256,7 +6866,7 @@ $define|y|true)
 	$cat << EOM
 
 On a few systems, the dynamically loaded modules that perl generates and uses
-will need a different extension then shared libs. The default will probably
+will need a different extension than shared libs. The default will probably
 be appropriate.
 
 EOM
@@ -6298,7 +6908,7 @@ $cat >fred.c<<EOM
 
 extern int fred() ;
 
-main()
+int main()
 {
     void * handle ;
     void * symbol ;
@@ -6332,9 +6942,9 @@ main()
 EOM
 	: Call the object file tmp-dyna.o in case dlext=o.
 	if $cc $ccflags $cccdlflags -c dyna.c > /dev/null 2>&1 && 
-		mv dyna${obj_ext} tmp-dyna${obj_ext} > /dev/null 2>&1 && 
-		$ld $lddlflags -o dyna.$dlext tmp-dyna${obj_ext} > /dev/null 2>&1 && 
-		$cc $ccflags $ldflags $cccdlflags $ccdlflags fred.c -o fred $libs > /dev/null 2>&1; then
+		mv dyna${_o} tmp-dyna${_o} > /dev/null 2>&1 && 
+		$ld $lddlflags -o dyna.$dlext tmp-dyna${_o} > /dev/null 2>&1 && 
+		$cc $ccflags -o fred $ldflags $cccdlflags $ccdlflags fred.c $libs > /dev/null 2>&1; then
 		xxx=`./fred`
 		case $xxx in
 		1)	echo "Test program failed using dlopen." >&4
@@ -6360,6 +6970,22 @@ eval $setvar
 set dup2 d_dup2
 eval $inlibc
 
+: see if endhostent exists
+set endhostent d_endhent
+eval $inlibc
+
+: see if endnetent exists
+set endnetent d_endnent
+eval $inlibc
+
+: see if endprotoent exists
+set endprotoent d_endpent
+eval $inlibc
+
+: see if endservent exists
+set endservent d_endsent
+eval $inlibc
+
 : Locate the flags for 'open()'
 echo " "
 $cat >open3.c <<'EOCP'
@@ -6370,7 +6996,7 @@ $cat >open3.c <<'EOCP'
 #ifdef I_SYS_FILE
 #include <sys/file.h>
 #endif
-main() {
+int main() {
 	if(O_RDONLY);
 #ifdef O_TRUNC
 	exit(0);
@@ -6381,7 +7007,7 @@ main() {
 EOCP
 : check sys/file.h first to get FREAD on Sun
 if $test `./findhdr sys/file.h` && \
-        $cc $ccflags "-DI_SYS_FILE" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
+		set open3 -DI_SYS_FILE && eval $compile; then
 	h_sysfile=true;
 	echo "<sys/file.h> defines the O_* constants..." >&4
 	if ./open3; then
@@ -6392,7 +7018,7 @@ if $test `./findhdr sys/file.h` && \
 		val="$undef"
 	fi
 elif $test `./findhdr fcntl.h` && \
-        $cc $ccflags "-DI_FCNTL" -o open3 $ldflags open3.c $libs >/dev/null 2>&1 ; then
+		set open3 -DI_FCNTL && eval $compile; then
 	h_fcntl=true;
 	echo "<fcntl.h> defines the O_* constants..." >&4
 	if ./open3; then
@@ -6426,7 +7052,7 @@ case "$o_nonblock" in
 '')
 	$cat head.c > try.c
 	$cat >>try.c <<'EOCP'
-main() {
+int main() {
 #ifdef O_NONBLOCK
 	printf("O_NONBLOCK\n");
 	exit(0);
@@ -6442,7 +7068,8 @@ main() {
 	exit(0);
 }
 EOCP
-	if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
+	set try
+	if eval $compile_ok; then
 		o_nonblock=`./try`
 		case "$o_nonblock" in
 		'') echo "I can't figure it out, assuming O_NONBLOCK will do.";;
@@ -6466,11 +7093,13 @@ case "$eagain" in
 #include <sys/types.h>
 #include <signal.h>
 #define MY_O_NONBLOCK $o_nonblock
+#ifndef errno  /* XXX need better Configure test */
 extern int errno;
+#endif
 $signal_t blech(x) int x; { exit(3); }
 EOCP
 	$cat >> try.c <<'EOCP'
-main()
+int main()
 {
 	int pd[2];
 	int pu[2];
@@ -6520,7 +7149,8 @@ main()
 	exit(0);				/* Bye bye, thank you for playing! */
 }
 EOCP
-	if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
+	set try
+	if eval $compile_ok; then
 		echo "$startsh" >mtry
 		echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry
 		chmod +x mtry
@@ -6619,14 +7249,117 @@ eval $inlibc
 set fsetpos d_fsetpos
 eval $inlibc
 
+: see if gethostbyaddr exists
+set gethostbyaddr d_gethbyaddr
+eval $inlibc
+
+: see if gethostbyname exists
+set gethostbyname d_gethbyname
+eval $inlibc
+
+: see if this is a sys/param system
+set sys/param.h i_sysparam
+eval $inhdr
+
+: see if this is a sys/mount.h system
+set sys/mount.h i_sysmount
+eval $inhdr
+
+: see if fstatfs exists
+set fstatfs d_fstatfs
+eval $inlibc
+
+: see if statfs knows about mount flags
+echo " "
+set d_statfsflags statfs f_flags $i_sysparam sys/param.h $i_sysmount sys/mount.h
+eval $hasfield
+
+: see if this is a sysstatvfs.h system
+set sys/statvfs.h i_sysstatvfs
+eval $inhdr
+
+: see if fstatvfs exists
+set fstatvfs d_fstatvfs
+eval $inlibc
+
 : see if gethostent exists
 set gethostent d_gethent
 eval $inlibc
 
+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 this is a netdb.h system
+set netdb.h i_netdb
+eval $inhdr
+
+: see if prototypes for various gethostxxx netdb.h functions are available
+echo " "
+set d_gethostprotos gethostent $i_netdb netdb.h
+eval $hasproto
+
 : see if getlogin exists
 set getlogin d_getlogin
 eval $inlibc
 
+: see if getnetbyaddr exists
+set getnetbyaddr d_getnbyaddr
+eval $inlibc
+
+: see if getnetbyname exists
+set getnetbyname d_getnbyname
+eval $inlibc
+
+: see if getnetent exists
+set getnetent d_getnent
+eval $inlibc
+
+: see if prototypes for various getnetxxx netdb.h functions are available
+echo " "
+set d_getnetprotos getnetent $i_netdb netdb.h
+eval $hasproto
+
+
+: see if getprotobyname exists
+set getprotobyname d_getpbyname
+eval $inlibc
+
+: see if getprotobynumber exists
+set getprotobynumber d_getpbynumber
+eval $inlibc
+
+: see if getprotoent exists
+set getprotoent d_getpent
+eval $inlibc
+
+: see if this is a mntent.h system
+set mntent.h i_mntent
+eval $inhdr
+
+: see if getmntent exists
+set getmntent d_getmntent
+eval $inlibc
+
+: see if hasmntopt exists
+set hasmntopt d_hasmntopt
+eval $inlibc
+
 : see if getpgid exists
 set getpgid d_getpgid
 eval $inlibc
@@ -6643,6 +7376,28 @@ eval $inlibc
 set getpriority d_getprior
 eval $inlibc
 
+: see if prototypes for various getprotoxxx netdb.h functions are available
+echo " "
+set d_getprotoprotos getprotoent $i_netdb netdb.h
+eval $hasproto
+
+: see if getservbyname exists
+set getservbyname d_getsbyname
+eval $inlibc
+
+: see if getservbyport exists
+set getservbyport d_getsbyport
+eval $inlibc
+
+: see if getservent exists
+set getservent d_getsent
+eval $inlibc
+
+: see if prototypes for various getservxxx netdb.h functions are available
+echo " "
+set d_getservprotos getservent $i_netdb netdb.h
+eval $hasproto
+
 : see if gettimeofday or ftime exists
 set gettimeofday d_gettimeod
 eval $inlibc
@@ -6666,6 +7421,10 @@ esac
 set netinet/in.h i_niin sys/in.h i_sysin
 eval $inhdr
 
+: see if arpa/inet.h has to be included
+set arpa/inet.h i_arpainet
+eval $inhdr
+
 : see if htonl --and friends-- exists
 val=''
 set htonl val
@@ -6679,12 +7438,16 @@ $undef)
 #include <sys/types.h>
 #$i_niin I_NETINET_IN
 #$i_sysin I_SYS_IN
+#$i_arpainet I_ARPA_INET
 #ifdef I_NETINET_IN
 #include <netinet/in.h>
 #endif
 #ifdef I_SYS_IN
 #include <sys/in.h>
 #endif
+#ifdef I_ARPA_INET
+#include <arpa/inet.h>
+#endif
 #ifdef htonl
 printf("Defined as a macro.");
 #endif
@@ -6764,7 +7527,7 @@ echo " "
 $cat >isascii.c <<'EOCP'
 #include <stdio.h>
 #include <ctype.h>
-main() {
+int main() {
 	int c = 'A';
 	if (isascii(c))
 		exit(0);
@@ -6772,7 +7535,8 @@ main() {
 		exit(1);
 }
 EOCP
-if $cc $ccflags $ldflags -o isascii isascii.c $libs >/dev/null 2>&1 ; then
+set isascii
+if eval $compile; then
 	echo "isascii() found." >&4
 	val="$define"
 else
@@ -6787,6 +7551,38 @@ $rm -f isascii*
 set killpg d_killpg
 eval $inlibc
 
+: see if lchown exists
+echo " "
+$cat > try.c <<'EOCP'
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char lchown(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char lchown();
+int main() {
+    /*  The GNU C library defines this for functions which it implements
+        to always fail with ENOSYS.  Some functions are actually named
+	something starting with __ and the normal name is an alias.  */
+#if defined (__stub_lchown) || defined (__stub___lchown)
+choke me
+#else
+lchown();
+#endif
+; return 0; }
+EOCP
+set try
+if eval $compile; then
+    $echo "lchown() found." >&4
+    val="$define"
+else
+    $echo "lchown() NOT found." >&4
+    val="$undef"
+fi
+set d_lchown
+eval $setvar
+
 : see if link exists
 set link d_link
 eval $inlibc
@@ -6799,6 +7595,98 @@ eval $inlibc
 set lockf d_lockf
 eval $inlibc
 
+: check for long doubles
+echo " "
+echo $n "Checking to see if your system supports long doubles...$c" >&4
+echo 'long double foo() { long double x; x = 7.0; return x; }' > try.c
+if $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then
+	val="$define"
+	echo " Yup, it does." >&4
+else
+	val="$undef"
+	echo " Nope, it doesn't." >&4
+fi
+$rm try.*
+set d_longdbl
+eval $setvar
+
+: check for length of long double
+case "${d_longdbl}${longdblsize}" in
+$define)
+	echo " "
+	$echo $n "Checking to see how big your long doubles are...$c" >&4
+	$cat >try.c <<'EOCP'
+#include <stdio.h>
+int main()
+{
+	printf("%d\n", sizeof(long double));
+}
+EOCP
+	set try
+	if eval $compile; then
+		longdblsize=`./try`
+		$echo " $longdblsize bytes." >&4
+	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.c try
+
+: check for long long
+echo " "
+echo $n "Checking to see if your system supports long long...$c" >&4
+echo 'long long foo() { long long x; x = 7; return x; }' > try.c
+if $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then
+	val="$define"
+	echo " Yup, it does." >&4
+else
+	val="$undef"
+	echo " Nope, it doesn't." >&4
+fi
+$rm try.*
+set d_longlong
+eval $setvar
+
+: check for length of long long
+case "${d_longlong}${longlongsize}" in
+$define)
+	echo " "
+	$echo $n "Checking to see how big your long longs are...$c" >&4
+	$cat >try.c <<'EOCP'
+#include <stdio.h>
+int main()
+{
+	printf("%d\n", sizeof(long long));
+}
+EOCP
+	set try
+	if eval $compile_ok; then
+		longlongsize=`./try`
+		$echo " $longlongsize bytes." >&4
+	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.c try
+
 : see if lstat exists
 set lstat d_lstat
 eval $inlibc
@@ -6865,6 +7753,25 @@ echo " "
 case "$d_msgctl$d_msgget$d_msgsnd$d_msgrcv" in
 *"$undef"*) h_msg=false;;
 esac
+case "$osname" in
+freebsd)
+    case "`ipcs 2>&1`" in
+    "SVID messages"*"not configured"*)
+	echo "Your $osname does not have the msg*(2) configured." >&4
+        h_msg=false
+	val="$undef"
+	set msgctl d_msgctl
+	eval $setvar
+	set msgget d_msgget
+	eval $setvar
+	set msgsnd d_msgsnd
+	eval $setvar
+	set msgrcv d_msgrcv
+	eval $setvar
+	;;
+    esac
+    ;;
+esac
 : we could also check for sys/ipc.h ...
 if $h_msg && $test `./findhdr sys/msg.h`; then
 	echo "You have the full msg*(2) library." >&4
@@ -6876,91 +7783,6 @@ fi
 set d_msg
 eval $setvar
 
-: 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 which malloc to compile in
-echo " "
-case "$usemymalloc" in
-''|y*|true)	dflt='y' ;;
-n*|false)	dflt='n' ;;
-*)	dflt="$usemymalloc" ;;
-esac
-rp="Do you wish to attempt to use the malloc that comes with $package?"
-. ./myread
-usemymalloc="$ans"
-case "$ans" in
-y*|true)
-	usemymalloc='y'
-	mallocsrc='malloc.c'
-	mallocobj='malloc.o'
-	d_mymalloc="$define"
-	case "$libs" in
-	*-lmalloc*)
-		: Remove malloc from list of libraries to use
-		echo "Removing unneeded -lmalloc from library list" >&4
-		set `echo X $libs | $sed -e 's/-lmalloc / /' -e 's/-lmalloc$//'`
-		shift
-		libs="$*"
-		echo "libs = $libs" >&4
-		;;
-	esac
-	;;
-*)
-	usemymalloc='n'
-	mallocsrc=''
-	mallocobj=''
-	d_mymalloc="$undef"
-	;;
-esac
-
-: compute the return types of malloc and free
-echo " "
-$cat >malloc.c <<END
-#$i_malloc I_MALLOC
-#$i_stdlib I_STDLIB
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef I_MALLOC
-#include <malloc.h>
-#endif
-#ifdef I_STDLIB
-#include <stdlib.h>
-#endif
-#ifdef TRY_MALLOC
-void *malloc();
-#endif
-#ifdef TRY_FREE
-void free();
-#endif
-END
-case "$malloctype" in
-'')
-	if $cc $ccflags -c -DTRY_MALLOC malloc.c >/dev/null 2>&1; then
-		malloctype='void *'
-	else
-		malloctype='char *'
-	fi
-	;;
-esac
-echo "Your system wants malloc to return '$malloctype', it would seem." >&4
-
-case "$freetype" in
-'')
-	if $cc $ccflags -c -DTRY_FREE malloc.c >/dev/null 2>&1; then
-		freetype='void'
-	else
-		freetype='int'
-	fi
-	;;
-esac
-echo "Your system uses $freetype free(), it would seem." >&4
-$rm -f malloc.[co]
 : see if nice exists
 set nice d_nice
 eval $inlibc
@@ -6977,12 +7799,108 @@ eval $inlibc
 set poll d_poll
 eval $inlibc
 
+
+: see whether the various POSIXish _yields exist
+$cat >try.c <<EOP
+#include <pthread.h>
+int main() {
+	YIELD();
+	exit(0);
+}
+EOP
+: see if pthread_yield exists within given cccmd,
+: if we do not usethreads this may well end up undef.
+set try -DYIELD=pthread_yield
+if eval $compile; then
+    val="$define"
+    echo 'pthread_yield() found.' >&4
+else
+    val="$undef"
+    echo 'pthread_yield() NOT found.' >&4
+fi
+set d_pthread_yield
+eval $setvar
+
+: see if sched_yield exists within given cccmd,
+: if we do not usethreads this may well end up undef.
+set try -DYIELD=sched_yield
+if eval $compile; then
+    val="$define"
+    echo 'sched_yield() found.' >&4
+else
+    val="$undef"
+    echo 'sched_yield() NOT found.' >&4
+fi
+set d_sched_yield
+eval $setvar
+$rm -f try try.*
+
+: see if this is a pthread.h system
+set pthread.h i_pthread
+eval $inhdr
+
+: see if this is a mach/cthreads.h system
+set mach/cthreads.h i_machcthreads
+eval $inhdr
+
+: test whether pthreads are created in joinable -- aka undetached -- state
+if test "X$usethreads" = "X$define" -a "X$i_pthread" = "X$define"; then
+	echo $n "Checking whether pthreads are created joinable. $c" >&4 
+	$cat >try.c <<EOCP
+#include <pthread.h>
+#include <stdio.h>
+int main() {
+    pthread_attr_t attr;
+    int detachstate;
+    printf("%s\n",
+	pthread_attr_init(&attr) == 0 &&
+        pthread_attr_getdetachstate(&attr, &detachstate) == 0 &&
+        detachstate == PTHREAD_CREATE_DETACHED ?
+        "detached" : "joinable");
+    exit(0);
+}
+EOCP
+	set try
+	if eval $compile; then
+		yyy=`./try`
+		case "$yyy" in
+			detached) echo "Nope, they aren't." >&4 ;;
+			*) echo "Yup, they are." >&4 ;;
+		esac
+	else
+		echo " "
+		echo "(I can't execute the test program--assuming they are.)" >&4
+		yyy=joinable
+	fi
+	$rm -f try try.*
+	case "$yyy" in
+		detached) val="$undef" ;;
+		*) val="$define" ;;
+	esac
+	set d_pthreads_created_joinable
+	eval $setvar
+else
+    d_pthreads_created_joinable="$undef"
+fi
+
 : see if this is a pwd.h system
 set pwd.h i_pwd
 eval $inhdr
 
 case "$i_pwd" in
 $define)
+	: see if setpwent exists
+	set setpwent d_setpwent
+	eval $inlibc
+
+	: see if getpwent exists
+	set getpwent d_getpwent
+	eval $inlibc
+
+	: see if endpwent exists
+	set endpwent d_endpwent
+	eval $inlibc
+
 	xxx=`./findhdr pwd.h`
 	$cppstdin $cppflags $cppminus < $xxx >$$.h
 
@@ -7034,16 +7952,37 @@ $define)
 	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
 	;;
-*)
+*)	# Assume all is lost as far as the d_*pw* go.
 	val="$undef"; 
+	set d_setpwent; eval $setvar
+	set d_getpwent; eval $setvar
+	set d_endpwent; eval $setvar
 	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
 
@@ -7099,15 +8038,14 @@ case "$d_bcopy" in
 "$define")
 	echo " "
 	echo "Checking to see if your bcopy() can do overlapping copies..." >&4
-	$cat >foo.c <<EOCP
+	$cat >try.c <<EOCP
 #$i_memory I_MEMORY
 #$i_stdlib I_STDLIB
 #$i_string I_STRING
 #$i_unistd I_UNISTD
 EOCP
-	$cat >>foo.c <<'EOCP'
+	$cat >>try.c <<'EOCP'
 #include <stdio.h>
-
 #ifdef I_MEMORY
 #  include <memory.h>
 #endif
@@ -7122,7 +8060,7 @@ EOCP
 #ifdef I_UNISTD
 #  include <unistd.h>  /* Needed for NetBSD */
 #endif
-main()
+int main()
 {
 char buf[128], abc[128];
 char *b;
@@ -7130,8 +8068,6 @@ int len;
 int off;
 int align;
 
-/* Copy "abcde..." string to char abc[] so that gcc doesn't
-   try to store the string in read-only memory.  */
 bcopy("abcdefghijklmnopqrstuvwxyz0123456789", abc, 36);
 
 for (align = 7; align >= 0; align--) {
@@ -7149,9 +8085,9 @@ for (align = 7; align >= 0; align--) {
 exit(0);
 }
 EOCP
-	if $cc $optimize $ccflags $ldflags foo.c \
-		    -o safebcpy $libs >/dev/null 2>&1; then
-		if ./safebcpy 2>/dev/null; then
+	set try
+	if eval $compile_ok; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7168,7 +8104,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* safebcpy core
+$rm -f try.* try core
 set d_safebcpy
 eval $setvar
 
@@ -7178,15 +8114,14 @@ case "$d_memcpy" in
 "$define")
 	echo " "
 	echo "Checking to see if your memcpy() can do overlapping copies..." >&4
-	$cat >foo.c <<EOCP
+	$cat >try.c <<EOCP
 #$i_memory I_MEMORY
 #$i_stdlib I_STDLIB
 #$i_string I_STRING
 #$i_unistd I_UNISTD
 EOCP
-	$cat >>foo.c <<'EOCP'
+	$cat >>try.c <<'EOCP'
 #include <stdio.h>
-
 #ifdef I_MEMORY
 #  include <memory.h>
 #endif
@@ -7201,7 +8136,7 @@ EOCP
 #ifdef I_UNISTD
 #  include <unistd.h>  /* Needed for NetBSD */
 #endif
-main()
+int main()
 {
 char buf[128], abc[128];
 char *b;
@@ -7228,9 +8163,9 @@ for (align = 7; align >= 0; align--) {
 exit(0);
 }
 EOCP
-	if $cc $optimize $ccflags $ldflags foo.c \
-		    -o safemcpy $libs >/dev/null 2>&1; then
-		if ./safemcpy 2>/dev/null; then
+	set try
+	if eval $compile_ok; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7247,7 +8182,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* safemcpy core
+$rm -f try.* try core
 set d_safemcpy
 eval $setvar
 
@@ -7256,16 +8191,15 @@ val="$undef"
 case "$d_memcmp" in
 "$define")
 	echo " "
-	echo "Checking to see if your memcmp() can compare relative magnitude..." >&4
-	$cat >foo.c <<EOCP
+	echo "Checking if your memcmp() can compare relative magnitude..." >&4
+	$cat >try.c <<EOCP
 #$i_memory I_MEMORY
 #$i_stdlib I_STDLIB
 #$i_string I_STRING
 #$i_unistd I_UNISTD
 EOCP
-	$cat >>foo.c <<'EOCP'
+	$cat >>try.c <<'EOCP'
 #include <stdio.h>
-
 #ifdef I_MEMORY
 #  include <memory.h>
 #endif
@@ -7280,7 +8214,7 @@ EOCP
 #ifdef I_UNISTD
 #  include <unistd.h>  /* Needed for NetBSD */
 #endif
-main()
+int main()
 {
 char a = -1;
 char b = 0;
@@ -7289,9 +8223,9 @@ if ((a < b) && memcmp(&a, &b, 1) < 0)
 exit(0);
 }
 EOCP
-	if $cc $optimize $ccflags $ldflags foo.c \
-		    -o sanemcmp $libs >/dev/null 2>&1; then
-		if ./sanemcmp 2>/dev/null; then
+	set try
+	if eval $compile_ok; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7302,7 +8236,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* sanemcmp core
+$rm -f try.* try core
 set d_sanemcmp
 eval $setvar
 
@@ -7328,6 +8262,23 @@ echo " "
 case "$d_semctl$d_semget$d_semop" in
 *"$undef"*) h_sem=false;;
 esac
+case "$osname" in
+freebsd)
+    case "`ipcs 2>&1`" in
+    "SVID messages"*"not configured"*)
+	echo "Your $osname does not have the sem*(2) configured." >&4
+        h_sem=false
+	val="$undef"
+	set semctl d_semctl
+	eval $setvar
+	set semget d_semget
+	eval $setvar
+	set semop d_semop
+	eval $setvar
+	;;
+    esac
+    ;;
+esac
 : we could also check for sys/ipc.h ...
 if $h_sem && $test `./findhdr sys/sem.h`; then
 	echo "You have the full sem*(2) library." >&4
@@ -7339,6 +8290,192 @@ fi
 set d_sem
 eval $setvar
 
+: see whether sys/sem.h defines union semun
+echo " "
+$cat > try.c <<'END'
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+int main () { union semun semun; semun.buf = 0; }
+END
+set try
+if eval $compile; then
+    echo "You have union semun in <sys/sem.h>." >&4
+    val="$define"
+else
+    echo "You do not have union semun in <sys/sem.h>." >&4
+    val="$undef"
+fi
+$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
+#   ifdef S_IREAD
+#	define S_IRUSR S_IREAD
+#	define S_IWUSR S_IWRITE
+#	define S_IXUSR S_IEXEC
+#   else
+#	define S_IRUSR 0400
+#	define S_IWUSR 0200
+#	define S_IXUSR 0100
+#   endif
+#   define S_IRGRP (S_IRUSR>>3)
+#   define S_IWGRP (S_IWUSR>>3)
+#   define S_IXGRP (S_IXUSR>>3)
+#   define S_IROTH (S_IRUSR>>6)
+#   define S_IWOTH (S_IWUSR>>6)
+#   define S_IXOTH (S_IXUSR>>6)
+#endif
+#ifndef S_IRWXU
+#   define S_IRWXU (S_IRUSR|S_IWUSR|S_IXUSR)
+#   define S_IRWXG (S_IRGRP|S_IWGRP|S_IXGRP)
+#   define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH)
+#endif
+END
+
+    $cat > try.c <<END
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <errno.h>
+#ifndef errno
+extern int errno;
+#endif
+#$d_union_semun HAS_UNION_SEMUN
+int main() {
+    union semun
+#ifndef HAS_UNION_SEMUN
+    {
+	int val;
+	struct semid_ds *buf;
+	unsigned short *array;
+    }
+#endif
+    arg;
+    int sem, st;
+
+#if defined(IPC_PRIVATE) && defined(S_IRWXU) && defined(S_IRWXG) && defined(S_IRWXO) && defined(IPC_CREAT)
+    sem = semget(IPC_PRIVATE, 1, S_IRWXU|S_IRWXG|S_IRWXO|IPC_CREAT);
+    if (sem > -1) {
+	struct semid_ds argbuf;
+	arg.buf = &argbuf;
+#	ifdef IPC_STAT
+	st = semctl(sem, 0, IPC_STAT, arg);
+	if (st == 0)
+	    printf("semun\n");
+	else
+#	endif /* IPC_STAT */
+	    printf("semctl IPC_STAT failed: errno = %d\n", errno);
+#	ifdef IPC_RMID
+	if (semctl(sem, 0, IPC_RMID, arg) != 0)
+#   	endif /* IPC_RMID */
+	    printf("semctl IPC_RMID failed: errno = %d\n", errno);
+    } else
+#endif /* IPC_PRIVATE && ... */
+	printf("semget failed: errno = %d\n", errno);
+  return 0;
+}
+END
+    val="$undef"
+    set try
+    if eval $compile; then
+	xxx=`./try`
+        case "$xxx" in
+        semun) val="$define" ;;
+        esac
+    fi
+    $rm -f try try.c
+    set d_semctl_semun
+    eval $setvar
+    case "$d_semctl_semun" in
+    $define)
+        echo "You can use union semun for semctl IPC_STAT." >&4
+	also='also '
+        ;;
+    *)  echo "You cannot use union semun for semctl IPC_STAT." >&4
+	also=''
+        ;;
+    esac
+
+    : see whether semctl IPC_STAT can use struct semid_ds pointer
+    $cat > try.c <<'END'
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <errno.h>
+#include "try.h"
+#ifndef errno
+extern int errno;
+#endif
+int main() {
+    struct semid_ds arg;
+    int sem, st;
+
+#if defined(IPC_PRIVATE) && defined(S_IRWXU) && defined(S_IRWXG) &&  defined(S_IRWXO) && defined(IPC_CREAT)
+    sem = semget(IPC_PRIVATE, 1, S_IRWXU|S_IRWXG|S_IRWXO|IPC_CREAT);
+    if (sem > -1) {
+#	ifdef IPC_STAT
+	st = semctl(sem, 0, IPC_STAT, &arg);
+	if (st == 0)
+	    printf("semid_ds\n");
+	else
+#	endif /* IPC_STAT */
+	    printf("semctl IPC_STAT failed: errno = %d\n", errno);
+#	ifdef IPC_RMID
+	if (semctl(sem, 0, IPC_RMID, &arg) != 0)
+#	endif /* IPC_RMID */
+	    printf("semctl IPC_RMID failed: errno = %d\n", errno);
+    } else
+#endif /* IPC_PRIVATE && ... */
+	printf("semget failed: errno = %d\n", errno);
+
+    return 0;
+}
+END
+    val="$undef"
+    set try
+    if eval $compile; then
+        xxx=`./try`
+        case "$xxx" in
+        semid_ds) val="$define" ;;
+        esac
+    fi
+    $rm -f try try.c
+    set d_semctl_semid_ds
+    eval $setvar
+    case "$d_semctl_semid_ds" in
+    $define)
+        echo "You can ${also}use struct semid_ds* for semctl IPC_STAT." >&4
+        ;;
+    *)  echo "You cannot use struct semid_ds* for semctl IPC_STAT." >&4
+        ;;
+    esac
+    $rm -f try.h
+    ;;
+*)  val="$undef"
+
+    # We do not have the full sem*(2) library, so assume we can not
+    # use either.
+
+    set d_semctl_semun
+    eval $setvar
+
+    set d_semctl_semid_ds
+    eval $setvar
+    ;;
+esac
+
 : see if setegid exists
 set setegid d_setegid
 eval $inlibc
@@ -7347,6 +8484,10 @@ eval $inlibc
 set seteuid d_seteuid
 eval $inlibc
 
+: see if sethostent exists
+set sethostent d_sethent
+eval $inlibc
+
 : see if setlinebuf exists
 set setlinebuf d_setlinebuf
 eval $inlibc
@@ -7355,6 +8496,14 @@ eval $inlibc
 set setlocale d_setlocale
 eval $inlibc
 
+: see if setnetent exists
+set setnetent d_setnent
+eval $inlibc
+
+: see if setprotoent exists
+set setprotoent d_setpent
+eval $inlibc
+
 : see if setpgid exists
 set setpgid d_setpgid
 eval $inlibc
@@ -7387,10 +8536,18 @@ eval $inlibc
 set setruid d_setruid
 eval $inlibc
 
+: see if setservent exists
+set setservent d_setsent
+eval $inlibc
+
 : see if setsid exists
 set setsid d_setsid
 eval $inlibc
 
+: see if setvbuf exists
+set setvbuf d_setvbuf
+eval $inlibc
+
 : see if sfio.h is available
 set sfio.h i_sfio
 eval $inhdr
@@ -7495,6 +8652,25 @@ echo " "
 case "$d_shmctl$d_shmget$d_shmat$d_shmdt" in
 *"$undef"*) h_shm=false;;
 esac
+case "$osname" in
+freebsd)
+    case "`ipcs 2>&1`" in
+    "SVID shared memory"*"not configured"*)
+	echo "But your $osname does not have the shm*(2) configured." >&4
+        h_shm=false
+	val="$undef"
+	set shmctl d_shmctl
+	evat $setvar
+	set shmget d_shmget
+	evat $setvar
+	set shmat d_shmat
+	evat $setvar
+	set shmdt d_shmdt
+	evat $setvar
+	;;
+    esac
+    ;;
+esac
 : we could also check for sys/ipc.h ...
 if $h_shm && $test `./findhdr sys/shm.h`; then
 	echo "You have the full shm*(2) library." >&4
@@ -7510,44 +8686,38 @@ echo " "
 : see if we have sigaction
 if set sigaction val -f d_sigaction; eval $csym; $val; then
 	echo 'sigaction() found.' >&4
-	val="$define"
-else
-	echo 'sigaction NOT found.' >&4
-	val="$undef"
-fi
-
-$cat > set.c <<'EOP'
-/* Solaris 2.5_x86 with SunWorks Pro C 3.0.1 doesn't have a complete
-   sigaction structure if compiled with cc -Xc.  This compile test
-   will fail then.  <doughera@lafcol.lafayette.edu>
-*/
+	$cat > try.c <<'EOP'
 #include <stdio.h>
 #include <sys/types.h>
 #include <signal.h>
-main()
+int main()
 {
     struct sigaction act, oact;
 }
 EOP
-
-if $cc $ccflags $ldflags -o set set.c $libs >/dev/null 2>&1; then
-	:
+	set try
+	if eval $compile_ok; then
+		val="$define"
+	else
+		echo "But you don't seem to have a useable struct sigaction." >&4
+		val="$undef"
+	fi
 else
-	echo "But you don't seem to have a useable struct sigaction." >&4
+	echo 'sigaction NOT found.' >&4
 	val="$undef"
 fi
 set d_sigaction; eval $setvar
-$rm -f set set.o set.c
+$rm -f try try$_o try.c
 
 : see if sigsetjmp exists
 echo " "
 case "$d_sigsetjmp" in
 '')
-	$cat >set.c <<'EOP'
+	$cat >try.c <<'EOP'
 #include <setjmp.h>
 sigjmp_buf env;
 int set = 1;
-main()
+int main()
 {
 	if (sigsetjmp(env,1))
 		exit(set);
@@ -7556,8 +8726,9 @@ main()
 	exit(1);
 }
 EOP
-	if $cc $ccflags $ldflags -o set set.c $libs > /dev/null 2>&1 ; then
-		if ./set >/dev/null 2>&1; then
+	set try
+	if eval $compile; then
+		if ./try >/dev/null 2>&1; then
 			echo "POSIX sigsetjmp found." >&4
 			val="$define"
 		else
@@ -7581,7 +8752,7 @@ EOM
 esac
 set d_sigsetjmp
 eval $setvar
-$rm -f set.c set
+$rm -f try.c try
 
 socketlib=''
 sockethdr=''
@@ -7604,27 +8775,33 @@ else
 		: we will have to assume that it supports the 4.2 BSD interface
 		d_oldsock="$undef"
 	else
-		echo "You don't have Berkeley networking in libc$lib_ext..." >&4
-		if test -f /usr/lib/libnet$lib_ext; then
-			( (nm $nm_opt /usr/lib/libnet$lib_ext | eval $nm_extract) ||  \
-			ar t /usr/lib/libnet$lib_ext) 2>/dev/null >> libc.list
-			if $contains socket libc.list >/dev/null 2>&1; then
-			echo "...but the Wollongong group seems to have hacked it in." >&4
-				socketlib="-lnet"
-				sockethdr="-I/usr/netinclude"
-				d_socket="$define"
-				if $contains setsockopt libc.list >/dev/null 2>&1; then
-					d_oldsock="$undef"
-				else
-					echo "...using the old 4.1c interface, rather than 4.2" >&4
-					d_oldsock="$define"
+		echo "You don't have Berkeley networking in libc$_a..." >&4
+		for net in net socket
+		do
+			if test -f /usr/lib/lib$net$_a; then
+				( ($nm $nm_opt /usr/lib/lib$net$_a | eval $nm_extract) ||  \
+				$ar t /usr/lib/lib$net$_a) 2>/dev/null >> libc.list
+				if $contains socket libc.list >/dev/null 2>&1; then
+					d_socket="$define"
+					case "$net" in
+					net)
+						echo "...but the Wollongong group seems to have hacked it in." >&4
+						socketlib="-lnet"
+						sockethdr="-I/usr/netinclude"
+						;;
+					esac
+					echo "Found Berkeley sockets interface in lib$net." >& 4 
+					if $contains setsockopt libc.list >/dev/null 2>&1; then
+						d_oldsock="$undef"
+					else
+						echo "...using the old 4.1c interface, rather than 4.2" >&4
+						d_oldsock="$define"
+					fi
+					break
 				fi
-			else
-				echo "or even in libnet$lib_ext, which is peculiar." >&4
-				d_socket="$undef"
-				d_oldsock="$undef"
 			fi
-		else
+		done
+		if test "X$d_socket" != "X$define"; then
 			echo "or anywhere else I see." >&4
 			d_socket="$undef"
 			d_oldsock="$undef"
@@ -7638,21 +8815,8 @@ eval $inlibc
 
 : see if stat knows about block sizes
 echo " "
-xxx=`./findhdr sys/stat.h`
-if $contains 'st_blocks;' "$xxx" >/dev/null 2>&1 ; then
-	if $contains 'st_blksize;' "$xxx" >/dev/null 2>&1 ; then
-		echo "Your stat() knows about block sizes." >&4
-		val="$define"
-	else
-		echo "Your stat() doesn't know about block sizes." >&4
-		val="$undef"
-	fi
-else
-	echo "Your stat() doesn't know about block sizes." >&4
-	val="$undef"
-fi
-set d_statblks
-eval $setvar
+set d_statblks stat st_blocks $i_sysstat sys/stat.h
+eval $hasfield
 
 : see if _ptr and _cnt from stdio act std
 echo " "
@@ -7702,7 +8866,7 @@ $cat >try.c <<EOP
 #include <stdio.h>
 #define FILE_ptr(fp)	$stdio_ptr
 #define FILE_cnt(fp)	$stdio_cnt
-main() {
+int main() {
 	FILE *fp = fopen("try.c", "r");
 	char c = getc(fp);
 	if (
@@ -7714,7 +8878,8 @@ main() {
 }
 EOP
 val="$undef"
-if $cc $ccflags $ldflags -o try try.c $libs >/dev/null 2>&1; then
+set try
+if eval $compile; then
 	if ./try; then
 		echo "Your stdio acts pretty std."
 		val="$define"
@@ -7744,7 +8909,6 @@ esac
 set d_stdio_cnt_lval
 eval $setvar
 
-
 : see if _base is also standard
 val="$undef"
 case "$d_stdstdio" in
@@ -7753,7 +8917,7 @@ $define)
 #include <stdio.h>
 #define FILE_base(fp)	$stdio_base
 #define FILE_bufsiz(fp)	$stdio_bufsiz
-main() {
+int main() {
 	FILE *fp = fopen("try.c", "r");
 	char c = getc(fp);
 	if (
@@ -7764,7 +8928,8 @@ main() {
 	exit(1);
 }
 EOP
-	if $cc $ccflags $ldflags -o try try.c $libs > /dev/null 2>&1; then
+	set try
+	if eval $compile; then
 		if ./try; then
 			echo "And its _base field acts std."
 			val="$define"
@@ -7788,7 +8953,7 @@ eval $inlibc
 echo " "
 echo "Checking to see if your C compiler can copy structs..." >&4
 $cat >try.c <<'EOCP'
-main()
+int main()
 {
 	struct blurfl {
 		int dyick;
@@ -7810,39 +8975,41 @@ $rm -f try.*
 
 : see if strerror and/or sys_errlist[] exist
 echo " "
-if set strerror val -f d_strerror; eval $csym; $val; then
+if test "X$d_strerror" = X -o "X$d_syserrlst" = X; then
+    if set strerror val -f d_strerror; eval $csym; $val; then
 	echo 'strerror() found.' >&4
 	d_strerror="$define"
 	d_strerrm='strerror(e)'
 	if set sys_errlist val -a d_syserrlst; eval $csym; $val; then	
-		echo "(You also have sys_errlist[], so we could roll our own strerror.)" 
-		d_syserrlst="$define"
+	    echo "(You also have sys_errlist[], so we could roll our own strerror.)" 
+	    d_syserrlst="$define"
 	else
-	echo "(Since you don't have sys_errlist[], sterror() is welcome.)"
-		d_syserrlst="$undef"
+	    echo "(Since you don't have sys_errlist[], sterror() is welcome.)"
+	    d_syserrlst="$undef"
 	fi
-elif xxx=`./findhdr string.h`; test "$xxx" || xxx=`./findhdr strings.h`; \
+    elif xxx=`./findhdr string.h`; test "$xxx" || xxx=`./findhdr strings.h`; \
 	$contains '#[ 	]*define.*strerror' "$xxx" >/dev/null 2>&1; then
 	echo 'strerror() found in string header.' >&4
 	d_strerror="$define"
 	d_strerrm='strerror(e)'
 	if set sys_errlist val -a d_syserrlst; eval $csym; $val; then	
-		echo "(Most probably, strerror() uses sys_errlist[] for descriptions.)"
-		d_syserrlst="$define"
+	echo "(Most probably, strerror() uses sys_errlist[] for descriptions.)"
+	    d_syserrlst="$define"
 	else
-		echo "(You don't appear to have any sys_errlist[], how can this be?)"
-		d_syserrlst="$undef"
+	    echo "(You don't appear to have any sys_errlist[], how can this be?)"
+	d_syserrlst="$undef"
 	fi
-elif set sys_errlist val -a d_syserrlst; eval $csym; $val; then
+    elif set sys_errlist val -a d_syserrlst; eval $csym; $val; then
 echo "strerror() not found, but you have sys_errlist[] so we'll use that." >&4
 	d_strerror="$undef"
 	d_syserrlst="$define"
 	d_strerrm='((e)<0||(e)>=sys_nerr?"unknown":sys_errlist[e])'
-else
+    else
 	echo 'strerror() and sys_errlist[] NOT found.' >&4
 	d_strerror="$undef"
 	d_syserrlst="$undef"
 	d_strerrm='"unknown"'
+    fi
 fi
 
 : see if strtod exists
@@ -7897,6 +9064,9 @@ case "$varval" in
 	for inc in $inclist; do
 		echo "#include <$inc>" >>temp.c;
 	done;
+	echo "#ifdef $type" >> temp.c;
+	echo "printf(\"We have $type\");" >> temp.c;
+	echo "#endif" >> temp.c;
 	$cppstdin $cppflags $cppminus < temp.c >temp.E 2>/dev/null;
 	if $contains $type temp.E >/dev/null 2>&1; then
 		eval "$var=\$type";
@@ -7907,6 +9077,37 @@ case "$varval" in
 *) eval "$var=\$varval";;
 esac'
 
+: define an is-a-typedef? function that prompts if the type is not available.
+typedef_ask='type=$1; var=$2; def=$3; shift; shift; shift; inclist=$@;
+case "$inclist" in
+"") inclist="sys/types.h";;
+esac;
+eval "varval=\$$var";
+case "$varval" in
+"")
+	$rm -f temp.c;
+	for inc in $inclist; do
+		echo "#include <$inc>" >>temp.c;
+	done;
+	echo "#ifdef $type" >> temp.c;
+	echo "printf(\"We have $type\");" >> temp.c;
+	echo "#endif" >> temp.c;
+	$cppstdin $cppflags $cppminus < temp.c >temp.E 2>/dev/null;
+	echo " " ;
+	echo "$rp" | $sed -e "s/What is/Looking for/" -e "s/?/./";
+	if $contains $type temp.E >/dev/null 2>&1; then
+		echo "$type found." >&4;
+		eval "$var=\$type";
+	else
+		echo "$type NOT found." >&4;
+		dflt="$def";
+		. ./myread ;
+		eval "$var=\$ans";
+	fi;
+	$rm -f temp.?;;
+*) eval "$var=\$varval";;
+esac'
+
 : see if this is a sys/times.h system
 set sys/times.h i_systimes
 eval $inhdr
@@ -7920,13 +9121,9 @@ if set times val -f d_times; eval $csym; $val; then
 	case "$i_systimes" in
 	"$define") inc='sys/times.h';;
 	esac
+	rp="What is the type returned by times() on this system?"
 	set clock_t clocktype long stdio.h sys/types.h $inc
-	eval $typedef
-	dflt="$clocktype"
-	echo " "
-	rp="What type is returned by times() on this system?"
-	. ./myread
-	clocktype="$ans"
+	eval $typedef_ask
 else
 	echo 'times() NOT found, hope that will do.' >&4
 	d_times="$undef"
@@ -8009,7 +9206,16 @@ $define)
 	false) dflt='n';;
 	*) dflt='y';;
 	esac
-	rp="Some systems have problems with vfork().  Do you want to use it?"
+	cat <<'EOM'
+ 
+Perl can only use a vfork() that doesn't suffer from strict
+restrictions on calling functions or modifying global data in
+the child.  For example, glibc-2.1 contains such a vfork()
+that is unsuitable.  If your system provides a proper fork()
+call, chances are that you do NOT want perl to use vfork().
+
+EOM
+	rp="Do you still want to use vfork()?"
 	. ./myread
 	case "$ans" in
 	y|Y) ;;
@@ -8035,6 +9241,10 @@ eval $inhdr
 set sys/ndir.h i_sysndir
 eval $inhdr
 
+: see if sys/types.h has to be included
+set sys/types.h i_systypes
+eval $inhdr
+
 : see if closedir exists
 set closedir d_closedir
 eval $inlibc
@@ -8047,7 +9257,11 @@ case "$d_closedir" in
 #$i_dirent I_DIRENT		/**/
 #$i_sysdir I_SYS_DIR		/**/
 #$i_sysndir I_SYS_NDIR		/**/
+#$i_systypes I_SYS_TYPES	/**/
 
+#if defined(I_SYS_TYPES)
+#include <sys/types.h>
+#endif
 #if defined(I_DIRENT)
 #include <dirent.h>
 #if defined(NeXT) && defined(I_SYS_DIR) /* NeXT needs dirent + sys/dir.h */
@@ -8068,7 +9282,8 @@ case "$d_closedir" in
 #endif 
 int main() { return closedir(opendir(".")); }
 EOM
-	if $cc $ccflags $ldflags -o closedir closedir.c $libs > /dev/null 2>&1; then
+	set closedir
+	if eval $compile_ok; then
 		if ./closedir > /dev/null 2>&1 ; then
 			echo "Yes, it does."
 			val="$undef"
@@ -8092,7 +9307,7 @@ $rm -f closedir*
 echo " "
 echo 'Checking to see if your C compiler knows about "volatile"...' >&4
 $cat >try.c <<'EOCP'
-main()
+int main()
 {
 	typedef struct _goo_struct goo_struct;
 	goo_struct * volatile goo = ((goo_struct *)0);
@@ -8151,12 +9366,13 @@ struct foobar {
 	char foo;
 	double bar;
 } try;
-main()
+int main()
 {
 	printf("%d\n", (char *)&try.bar - (char *)&try.foo);
 }
 EOCP
-	if $cc $ccflags try.c -o try >/dev/null 2>&1; then
+	set try
+	if eval $compile_ok; then
 		dflt=`./try`
 	else
 		dflt='8'
@@ -8185,7 +9401,7 @@ I'm now running the test program...
 EOM
 	$cat >try.c <<'EOCP'
 #include <stdio.h>
-main()
+int main()
 {
 	int i;
 	union {
@@ -8204,7 +9420,8 @@ main()
 }
 EOCP
 	xxx_prompt=y
-	if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
+	set try
+	if eval $compile && ./try > /dev/null; then
 		dflt=`./try`
 		case "$dflt" in
 		[1-4][1-4][1-4][1-4]|12345678|87654321)
@@ -8245,11 +9462,11 @@ ACAT(Cir,cus)
 EOCP
 $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
 if $contains 'Circus' cpp_stuff.out >/dev/null 2>&1; then
-	echo "Oh!  Smells like ANSI's been here."
+	echo "Oh!  Smells like ANSI's been here." >&4
 	echo "We can catify or stringify, separately or together!"
 	cpp_stuff=42
 elif $contains 'Reiser' cpp_stuff.out >/dev/null 2>&1; then
-	echo "Ah, yes!  The good old days!"
+	echo "Ah, yes!  The good old days!" >&4
 	echo "However, in the good old days we don't know how to stringify and"
 	echo "catify at the same time."
 	cpp_stuff=1
@@ -8268,7 +9485,7 @@ eval $inhdr
 
 case "$i_db" in
 $define)
-	: Check db version.  We can not use version 2.
+	: Check db version.
 	echo " "
 	echo "Checking Berkeley DB version ..." >&4
 	$cat >try.c <<EOCP
@@ -8279,15 +9496,41 @@ $define)
 #include <sys/types.h>
 #include <stdio.h>
 #include <db.h>
-main()
+int main()
 {
-#ifdef DB_VERSION_MAJOR	/* DB version >= 2: not yet. */
-    printf("You have Berkeley DB Version %d.%d\n",
-		DB_VERSION_MAJOR, DB_VERSION_MINOR);
-    printf("Perl currently only supports up to version 1.86.\n");
-    exit(2);
+#ifdef DB_VERSION_MAJOR	/* DB version >= 2 */
+    int Major, Minor, Patch ;
+    unsigned long Version ;
+    (void)db_version(&Major, &Minor, &Patch) ;
+    printf("You have Berkeley DB Version 2 or greater\n");
+
+    printf("db.h is from Berkeley DB Version %d.%d.%d\n",
+		DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH);
+    printf("libdb is from Berkeley DB Version %d.%d.%d\n",
+		Major, Minor, Patch) ;
+
+    /* check that db.h & libdb are compatible */
+    if (DB_VERSION_MAJOR != Major || DB_VERSION_MINOR != Minor || DB_VERSION_PATCH != Patch) {
+	printf("db.h and libdb are incompatible\n") ;
+        exit(3);	
+    }
+
+    printf("db.h and libdb are compatible\n") ;
+
+    Version = DB_VERSION_MAJOR * 1000000 + DB_VERSION_MINOR * 1000
+		+ DB_VERSION_PATCH ;
+
+    /* needs to be >= 2.3.4 */
+    if (Version < 2003004) {
+    /* if (DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR == 0 && DB_VERSION_PATCH < 5) { */
+	printf("but Perl needs Berkeley DB 2.3.4 or greater\n") ;
+        exit(2);	
+    }
+
+    exit(0);
 #else
 #if defined(_DB_H_) && defined(BTREEMAGIC) && defined(HASHMAGIC)
+    printf("You have Berkeley DB Version 1\n");
     exit(0);	/* DB version < 2: the coast is clear. */
 #else
     exit(1);	/* <db.h> not Berkeley DB? */
@@ -8295,8 +9538,9 @@ main()
 #endif
 }
 EOCP
-	if $cc $optimize $ccflags $ldflags -o try try.c $libs && ./try; then
-		echo 'Looks OK.  (Perl supports up to version 1.86).' >&4
+	set try
+	if eval $compile && ./try; then
+		echo 'Looks OK.' >&4
 	else
 		echo "I can't use Berkeley DB with your <db.h>.  I'll disable Berkeley DB." >&4
 		i_db=$undef
@@ -8327,16 +9571,19 @@ define)
 #endif
 #include <sys/types.h>
 #include <db.h>
+
+#ifndef DB_VERSION_MAJOR
 u_int32_t hash_cb (ptr, size)
 const void *ptr;
 size_t size;
 {
 }
 HASHINFO info;
-main()
+int main()
 {
 	info.hash = hash_cb;
 }
+#endif
 EOCP
 	if $cc $ccflags -c try.c >try.out 2>&1 ; then
 		if $contains warning try.out >>/dev/null 2>&1 ; then
@@ -8347,6 +9594,7 @@ EOCP
 	else
 		: XXX Maybe we should just give up here.
 		db_hashtype=u_int32_t
+		$cat try.out >&4
 		echo "Help:  I can't seem to compile the db test program." >&4
 		echo "Something's wrong, but I'll assume you use $db_hashtype." >&4
 	fi
@@ -8356,7 +9604,6 @@ EOCP
 *)	db_hashtype=u_int32_t
 	;;
 esac
-
 case "$i_db" in
 define)
 	: Check the return type needed for prefix 
@@ -8369,16 +9616,19 @@ define)
 #endif
 #include <sys/types.h>
 #include <db.h>
+
+#ifndef DB_VERSION_MAJOR
 size_t prefix_cb (key1, key2)
 const DBT *key1;
 const DBT *key2;
 {
 }
 BTREEINFO info;
-main()
+int main()
 {
 	info.prefix = prefix_cb;
 }
+#endif
 EOCP
 	if $cc $ccflags -c try.c  >try.out 2>&1 ; then
 		if $contains warning try.out >>/dev/null 2>&1 ; then
@@ -8389,6 +9639,7 @@ EOCP
 	else
 		db_prefixtype='size_t'
 		: XXX Maybe we should just give up here.
+		$cat try.out >&4
 		echo "Help:  I can't seem to compile the db test program." >&4
 		echo "Something's wrong, but I'll assume you use $db_prefixtype." >&4
 	fi
@@ -8402,15 +9653,6 @@ esac
 : check for void type
 echo " "
 echo "Checking to see how well your C compiler groks the void type..." >&4
-echo " "
-$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
-echo " "
 case "$voidflags" in
 '')
 	$cat >try.c <<'EOCP'
@@ -8435,11 +9677,11 @@ sub() {
 #endif
 	exit(0);
 }
-main() { sub(); }
+int main() { sub(); }
 EOCP
 	if $cc $ccflags -c -DTRY=$defvoidused try.c >.out 2>&1 ; then
 		voidflags=$defvoidused
-	echo "It appears to support void to the level $package wants ($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
@@ -8483,10 +9725,15 @@ echo "Hmm, your compiler has some difficulty with void. Checking further..." >&4
 		fi
 	fi
 esac
-: Only prompt user if support does not match the level we want
 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
@@ -8495,19 +9742,88 @@ case "$voidflags" in
 esac
 $rm -f try.* .out
 
-: see what type file positions are declared as in the library
-set fpos_t fpostype long stdio.h sys/types.h
-eval $typedef
+: check for length of double
 echo " "
-dflt="$fpostype"
+case "$doublesize" in
+'')
+	$echo $n "Checking to see how big your double precision numbers are...$c" >&4
+	$cat >try.c <<'EOCP'
+#include <stdio.h>
+int main()
+{
+	printf("%d\n", sizeof(double));
+}
+EOCP
+	set try
+	if eval $compile_ok; then
+		doublesize=`./try`
+		$echo " $doublesize bytes." >&4
+	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
+
+echo " "
+echo "Determining whether or not we are on an EBCDIC system..." >&4
+$cat >tebcdic.c <<EOM
+int main()
+{
+  if ('M'==0xd4) return 0;
+  return 1;
+}
+EOM
+val=$undef
+set tebcdic
+if eval $compile_ok; then
+	if ./tebcdic; then
+		echo "You have EBCDIC." >&4
+		val="$define"
+	else
+		echo "Nope, no EBCDIC.  Assuming ASCII or some ISO Latin." >&4
+	fi
+else
+	echo "I'm unable to compile the test program." >&4
+	echo "I'll assume ASCII or some ISO Latin." >&4
+fi
+$rm -f tebcdic.c tebcdic
+set ebcdic
+eval $setvar
+
+: see what type file positions are declared as in the library
 rp="What is the type for file position used by fsetpos()?"
-. ./myread
-fpostype="$ans"
+set fpos_t fpostype long stdio.h sys/types.h
+eval $typedef_ask
+
+: get csh whereabouts
+case "$csh" in
+'csh') val="$undef" ;;
+*) val="$define" ;;
+esac
+set d_csh
+eval $setvar
+: Respect a hint or command line value for full_csh.
+case "$full_csh" in
+'') full_csh=$csh ;;
+esac
 
 : Store the full pathname to the sed program for use in the C program
 full_sed=$sed
 
+: Store the full pathname to the ar program for use in the Makefile.SH
+: Respect a hint or command line value for full_ar.
+case "$full_ar" in
+'') full_ar=$ar ;;
+esac
+
 : see what type gids are declared as in the kernel
+echo " "
+echo "Looking for the type for group ids returned by getgid()."
 set gid_t gidtype xxx stdio.h sys/types.h
 eval $typedef
 case "$gidtype" in
@@ -8521,10 +9837,13 @@ xxx)
 	;;
 *) dflt="$gidtype";;
 esac
-echo " "
-rp="What is the type for group ids returned by getgid()?"
-. ./myread
-gidtype="$ans"
+case "$gidtype" in
+gid_t) echo "gid_t found." ;;
+*)	rp="What is the type for group ids returned by getgid()?"
+	. ./myread
+	gidtype="$ans"
+	;;
+esac
 
 : see if getgroups exists
 set getgroups d_getgrps
@@ -8534,6 +9853,7 @@ eval $inlibc
 set setgroups d_setgrps
 eval $inlibc
 
+
 : Find type of 2nd arg to 'getgroups()' and 'setgroups()'
 echo " "
 case "$d_getgrps$d_setgrps" in
@@ -8543,11 +9863,11 @@ case "$d_getgrps$d_setgrps" in
 	*)  dflt="$groupstype" ;;
 	esac
 	$cat <<EOM
-What is the type of the second argument to getgroups() and setgroups()?
+What type of pointer is the second argument to getgroups() and setgroups()?
 Usually this is the same as group ids, $gidtype, but not always.
 
 EOM
-	rp='What type is the second argument to getgroups() and setgroups()?'
+	rp='What type pointer is the second argument to getgroups() and setgroups()?'
 	. ./myread
 	groupstype="$ans"
 	;;
@@ -8555,59 +9875,208 @@ EOM
 esac
 
 : see what type lseek is declared as in the kernel
+rp="What is the type used for lseek's offset on this system?"
 set off_t lseektype long stdio.h sys/types.h
-eval $typedef
-echo " "
-dflt="$lseektype"
-rp="What type is lseek's offset on this system declared as?"
-. ./myread
-lseektype="$ans"
+eval $typedef_ask
 
 echo " "
-case "$make" in
-'')
-	make=`./loc make make $pth`
-	case "$make" in
-	/*)	echo make is in $make.  ;;
-	?:[\\/]*)	echo make is in $make.  ;;
-	*)	echo "I don't know where 'make' is, and my life depends on it." >&4
-		echo "Go find a make program or fix your PATH setting!" >&4
-		exit 1
-		;;
-	esac
-	;;
-*)	echo make is in $make. ;;
-esac
-
-$echo $n "Checking if your $make program sets \$(MAKE)... $c" >&4
+echo "Checking if your $make program sets \$(MAKE)..." >&4
 case "$make_set_make" in
 '')
 	$sed 's/^X //' > testmake.mak << 'EOF'
 Xall:
-X 	@echo 'ac_maketemp="$(MAKE)"'
+X 	@echo 'maketemp="$(MAKE)"'
 EOF
-	: GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 	case "`$make -f testmake.mak 2>/dev/null`" in
-	*ac_maketemp=*) make_set_make='#' ;;
+	*maketemp=*) make_set_make='#' ;;
 	*)	make_set_make="MAKE=$make" ;;
 	esac
 	$rm -f testmake.mak
 	;;
 esac
 case "$make_set_make" in
-'#')	echo "Yup, it does." >&4 ;;
-*)	echo "Nope, it doesn't." >&4 ;;
+'#') echo "Yup, it does.";;
+*) echo "Nope, it doesn't.";;
 esac
 
 : see what type is used for mode_t
+rp="What is the type used for file modes for system calls (e.g. fchmod())?"
 set mode_t modetype int stdio.h sys/types.h
-eval $typedef
-dflt="$modetype"
-echo " "
-rp="What type is used for file modes?"
-. ./myread
-modetype="$ans"
+eval $typedef_ask
+
+: 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
+eval $typedef_ask
+
+: check for type of arguments to gethostbyaddr. 
+if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then
+	case "$d_gethbyaddr" in
+	$define)
+		$cat <<EOM
+
+Checking to see what type of arguments are accepted by gethostbyaddr().
+EOM
+		hdrs="$define sys/types.h
+			$d_socket sys/socket.h 
+			$i_niin netinet/in.h 
+			$i_netdb netdb.h
+			$i_unistd unistd.h"
+		: The first arg can 'char *' or 'void *'
+		: The second arg is some of integral type
+		for xxx in in_addr_t 'const void *' 'const char *' 'void *' 'char *'; do
+			for yyy in size_t long int; do
+				case "$netdb_host_type" in
+				'')	try="extern struct hostent *gethostbyaddr($xxx, $yyy, int);"
+					if ./protochk "$try" $hdrs; then
+						echo "Your system accepts $xxx for the first arg."
+						echo "...and $yyy for the second arg."
+						netdb_host_type="$xxx"
+						netdb_hlen_type="$yyy"
+					fi
+					;;
+				esac
+			done
+		done
+		: In case none of those worked, prompt the user.
+		case "$netdb_host_type" in
+		'')	rp='What is the type for the 1st argument to gethostbyaddr?'
+			dflt='char *'
+			. ./myread
+			netdb_host_type=$ans
+			rp='What is the type for the 2nd argument to gethostbyaddr?'
+			dflt="$sizetype"
+			. ./myread
+			netdb_hlen_type=$ans
+			;;
+		esac
+		;;
+	*)	: no gethostbyaddr, so pick harmless defaults
+		netdb_host_type='char *'
+		netdb_hlen_type="$sizetype"
+		;;
+	esac
+	# Remove the "const" if needed. -- but then we'll have a 
+	# prototype clash!
+	# netdb_host_type=`echo "$netdb_host_type" | sed 's/^const //'`
+fi
+
+: check for type of argument to gethostbyname. 
+if test "X$netdb_name_type" = X ; then
+	case "$d_gethbyname" in
+	$define)
+		$cat <<EOM
+
+Checking to see what type of argument is accepted by gethostbyname().
+EOM
+		hdrs="$define sys/types.h
+			$d_socket sys/socket.h 
+			$i_niin netinet/in.h 
+			$i_netdb netdb.h
+			$i_unistd unistd.h"
+		for xxx in "const char *" "char *"; do
+			case "$netdb_name_type" in
+			'')	try="extern struct hostent *gethostbyname($xxx);"
+				if ./protochk "$try" $hdrs; then
+					echo "Your system accepts $xxx."
+					netdb_name_type="$xxx"
+				fi
+				;;
+			esac
+		done
+		: In case none of those worked, prompt the user.
+		case "$netdb_name_type" in
+		'')	rp='What is the type for the 1st argument to gethostbyname?'
+			dflt='char *'
+			. ./myread
+			netdb_name_type=$ans
+			;;
+		esac
+		;;
+	*)	: no gethostbyname, so pick harmless default
+		netdb_name_type='char *'
+		;;
+	esac
+fi
 
+: check for type of 1st argument to getnetbyaddr. 
+if test "X$netdb_net_type" = X ; then
+	case "$d_getnbyaddr" in
+	$define)
+		$cat <<EOM
+
+Checking to see what type of 1st argument is accepted by getnetbyaddr().
+EOM
+		hdrs="$define sys/types.h
+			$d_socket sys/socket.h 
+			$i_niin netinet/in.h 
+			$i_netdb netdb.h
+			$i_unistd unistd.h"
+		for xxx in in_addr_t "unsigned long" long "unsigned int" int; do
+			case "$netdb_net_type" in
+			'')	try="extern struct netent *getnetbyaddr($xxx, int);"
+				if ./protochk "$try" $hdrs; then
+					echo "Your system accepts $xxx."
+					netdb_net_type="$xxx"
+				fi
+				;;
+			esac
+		done
+		: In case none of those worked, prompt the user.
+		case "$netdb_net_type" in
+		'')	rp='What is the type for the 1st argument to getnetbyaddr?'
+			dflt='long'
+			. ./myread
+			netdb_net_type=$ans
+			;;
+		esac
+		;;
+	*)	: no getnetbyaddr, so pick harmless default
+		netdb_net_type='long'
+		;;
+	esac
+fi
 : locate the preferred pager for this system
 case "$pager" in
 '')
@@ -8633,23 +10102,43 @@ rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"
 
-: Cruising for prototypes
+: see what type pids are declared as in the kernel
+rp="What is the type of process ids on this system?"
+set pid_t pidtype int stdio.h sys/types.h
+eval $typedef_ask
+
+: check for length of pointer
 echo " "
-echo "Checking out function prototypes..." >&4
-$cat >prototype.c <<'EOCP'
-main(int argc, char *argv[]) {
-	exit(0);}
+case "$ptrsize" in
+'')
+	$echo $n "Checking to see how big your pointers are...$c" >&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", sizeof(VOID_PTR));
+	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*
+	set try
+	if eval $compile_ok; then
+		ptrsize=`./try`
+		$echo " $ptrsize bytes." >&4
+	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 size of random number generator
 echo " "
@@ -8668,7 +10157,7 @@ case "$randbits" in
 #endif
 EOCP
 	$cat >>try.c <<'EOCP'
-main()
+int main()
 {
 	register int i;
 	register unsigned long tmp;
@@ -8681,11 +10170,11 @@ main()
 	for (i = 0; max; i++)
 		max /= 2;
 	printf("%d\n",i);
-	fflush(stdout);
 }
 EOCP
-	if $cc $ccflags $ldflags -o try try.c $libs >/dev/null 2>&1 ; then
-		dflt=`try`
+	set try
+	if eval $compile_ok; then
+		dflt=`./try$_exe`
 	else
 		dflt='?'
 		echo "(I can't seem to compile the test program...)"
@@ -8698,7 +10187,7 @@ esac
 rp='How many bits does your rand() function produce?'
 . ./myread
 randbits="$ans"
-$rm -f try.c try.o try
+$rm -f try.* try
 
 : see if ar generates random libraries by itself
 echo " "
@@ -8706,23 +10195,23 @@ 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'
-main() { printf("%d\n", bar1()); exit(0); }
+int main() { printf("%d\n", bar1()); exit(0); }
 EOP
 $cc $ccflags -c bar1.c >/dev/null 2>&1
 $cc $ccflags -c bar2.c >/dev/null 2>&1
 $cc $ccflags -c foo.c >/dev/null 2>&1
-ar rc bar$lib_ext bar2.o bar1.o >/dev/null 2>&1
-if $cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
+$ar rc bar$_a bar2$_o bar1$_o >/dev/null 2>&1
+if $cc $ccflags $ldflags -o foobar foo$_o bar$_a $libs > /dev/null 2>&1 &&
 	./foobar >/dev/null 2>&1; then
-	echo "ar appears to generate random libraries itself."
+	echo "$ar appears to generate random libraries itself."
 	orderlib=false
 	ranlib=":"
-elif ar ts bar$lib_ext >/dev/null 2>&1 &&
-	$cc $ccflags $ldflags -o foobar foo.o bar$lib_ext $libs > /dev/null 2>&1 &&
+elif $ar ts bar$_a >/dev/null 2>&1 &&
+	$cc $ccflags $ldflags -o foobar foo$_o bar$_a $libs > /dev/null 2>&1 &&
 	./foobar >/dev/null 2>&1; then
-		echo "a table of contents needs to be added with 'ar ts'."
+		echo "a table of contents needs to be added with '$ar ts'."
 		orderlib=false
-		ranlib="ar ts"
+		ranlib="$ar ts"
 else
 	case "$ranlib" in
 	:) ranlib='';;
@@ -8749,9 +10238,10 @@ eval $inhdr
 
 : see if we should include time.h, sys/time.h, or both
 echo " "
-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'
+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>
@@ -8765,7 +10255,7 @@ $cat >try.c <<'EOCP'
 #ifdef I_SYSSELECT
 #include <sys/select.h>
 #endif
-main()
+int main()
 {
 	struct tm foo;
 #ifdef S_TIMEVAL
@@ -8783,19 +10273,18 @@ main()
 	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
+    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"
-		if $cc $ccflags \
-		$i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
-		try.c -o try >/dev/null 2>&1 ; then
-			set X $i_time $i_systime $i_systimek $sysselect $s_timeval
+		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 " "
@@ -8803,32 +10292,33 @@ for i_systime in '-DI_SYSTIME' ''; do
 		fi
 		;;
 	esac
-done
-done
-done
-done
-done
-timeincl=''
-echo " "
-case "$flags" in
-*SYSTIMEKERNEL*) i_systimek="$define"
+    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"
+    *) 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"
+    *) 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
+    *) i_systime="$undef";;
+    esac
+    $rm -f try.c try
+fi
 
 : check for fd_set items
 $cat <<EOM
@@ -8849,7 +10339,7 @@ $cat >fd_set.c <<EOCP
 #ifdef I_SYS_SELECT
 #include <sys/select.h>
 #endif
-main() {
+int main() {
 	fd_set fds;
 
 #ifdef TRYBITS
@@ -8863,7 +10353,8 @@ main() {
 #endif
 }
 EOCP
-if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
+set fd_set -DTRYBITS
+if eval $compile; then
 	d_fds_bits="$define"
 	d_fd_set="$define"
 	echo "Well, your system knows about the normal fd_set typedef..." >&4
@@ -8880,7 +10371,8 @@ else
 	$cat <<'EOM'
 Hmm, your compiler has some difficulty with fd_set.  Checking further...
 EOM
-	if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
+	set fd_set
+	if eval $compile; then
 		d_fds_bits="$undef"
 		d_fd_set="$define"
 		echo "Well, your system has some sort of fd_set available..." >&4
@@ -8902,73 +10394,146 @@ EOM
 fi
 $rm -f fd_set*
 
-
-: check for type of arguments to select.  This will only really
-: work if the system supports prototypes and provides one for
-: select.
-case "$d_select" in
-$define)
-	: Make initial guess
-	case "$selecttype" in
-	''|' ')
-		case "$d_fd_set" in
-		$define) xxx='fd_set *' ;;
-		*) xxx='int *' ;;
+: check for type of arguments to select. 
+case "$selecttype" in
+'') case "$d_select" in
+	$define)
+		$cat <<EOM
+Checking to see what type of arguments are accepted by select().
+EOM
+		hdrs="$define sys/types.h
+			$i_systime sys/time.h 
+			$i_sysselct sys/select.h
+			$d_socket sys/socket.h"
+		: The first arg can be int, unsigned, or size_t
+		: The last arg may or may not be 'const'
+		val=''
+		: void pointer has been seen but using that
+		: breaks the selectminbits test
+		for xxx in 'fd_set *' 'int *'; do
+			for nfd in 'int' 'size_t' 'unsigned' 'unsigned long'; do
+				for tmo in 'struct timeval *' 'const struct timeval *'; do
+					case "$val" in
+					'')	try="extern select _(($nfd, $xxx, $xxx, $xxx, $tmo));"
+						if ./protochk "$try" $hdrs; then
+							echo "Your system accepts $xxx."
+							val="$xxx"
+						fi
+						;;
+					esac
+				done
+			done
+		done
+		case "$val" in
+		'')	rp='What is the type for the 2nd, 3rd, and 4th arguments to select?'
+			case "$d_fd_set" in
+				$define) dflt="fd_set *" ;;
+				*)		dflt="int *" ;;
+			esac
+			. ./myread
+			val=$ans
+			;;
 		esac
+		selecttype="$val"
 		;;
-	*) 	xxx="$selecttype" 
+	*)	: no select, so pick a harmless default
+		selecttype='int *'
 		;;
 	esac
-	: backup guess
-	case "$xxx" in
-	'fd_set *') yyy='int *' ;;
-	'int *') yyy='fd_set *' ;;
-	esac
+	;;
+esac
 
-	$cat <<EOM
+: check for the select 'width'
+case "$selectminbits" in
+'') case "$d_select" in
+	$define)
+		$cat <<EOM
 
-Checking to see what type of arguments are expected by select().
+Checking to see on how many bits at a time your select() operates...
 EOM
-	$cat >try.c <<EOCP
-#$i_systime I_SYS_TIME
-#$i_sysselct I_SYS_SELECT
-#$d_socket HAS_SOCKET
+		$cat >try.c <<EOCP
 #include <sys/types.h>
-#ifdef HAS_SOCKET
-#include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
+#$i_time I_TIME
+#$i_systime I_SYS_TIME
+#$i_systimek I_SYS_TIME_KERNEL
+#ifdef I_TIME
+#   include <time.h>
 #endif
 #ifdef I_SYS_TIME
-#include <sys/time.h>
+#   ifdef I_SYS_TIME_KERNEL
+#	define KERNEL
+#   endif
+#   include <sys/time.h>
+#   ifdef I_SYS_TIME_KERNEL
+#	undef KERNEL
+#   endif
 #endif
+#$i_sysselct I_SYS_SELECT
 #ifdef I_SYS_SELECT
 #include <sys/select.h>
 #endif
-main()
-{
-	int width;
-	Select_fd_set_t readfds;
-	Select_fd_set_t writefds;
-	Select_fd_set_t exceptfds;
-	struct timeval timeout;
-	select(width, readfds, writefds, exceptfds, &timeout);
-	exit(0);
+#include <stdio.h>
+$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];
+    struct timeval t;
+    int i;
+    FILE* fp;
+    int fd;
+
+    fclose(stdin);
+    fp = fopen("try.c", "r");
+    if (fp == 0)
+      exit(1);
+    fd = fileno(fp);
+    if (fd < 0)
+      exit(2);
+    b = ($selecttype)s;
+    for (i = 0; i < NBITS; i++)
+	FD_SET(i, b);
+    t.tv_sec  = 0;
+    t.tv_usec = 0;
+    select(fd + 1, b, 0, 0, &t);
+    for (i = NBITS - 1; i > fd && FD_ISSET(i, b); i--);
+    printf("%d\n", i + 1);
+    return 0;
 }
 EOCP
-	if $cc $ccflags -c -DSelect_fd_set_t="$xxx" try.c >/dev/null 2>&1 ; then
-		selecttype="$xxx"
-		echo "Your system uses $xxx for the arguments to select." >&4
-	elif $cc $ccflags -c -DSelect_fd_set_t="$yyy" try.c >/dev/null 2>&1 ; then
-		selecttype="$yyy"
-		echo "Your system uses $yyy for the arguments to select." >&4
-	else
-		rp='What is the type for the 2nd, 3rd, and 4th arguments to select?'
-		dflt="$xxx"
-		. ./myread
-		selecttype="$ans"
-	fi
-	$rm -f try.[co]
-	;;
-*)	selecttype='int *'
+		set try
+		if eval $compile_ok; then
+			selectminbits=`./try`
+			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.
+EOM
+				selectminbits=32
+				bits="32 bits"
+				;;
+			1)	bits="1 bit" ;;
+			*)	bits="$selectminbits bits" ;;
+			esac
+			echo "Your select() operates on $bits at a time." >&4
+		else
+			rp='What is the minimum number of bits your select() operates on?'
+			case "$byteorder" in
+			1234|12345678)	dflt=32 ;;
+			*)		dflt=1	;;
+			esac
+			. ./myread
+			val=$ans
+			selectminbits="$val"
+		fi
+		$rm -f try.* try
+		;;
+	*)	: no select, so pick a harmless default
+		selectminbits='32'
+		;;
+	esac
 	;;
 esac
 
@@ -9003,9 +10568,10 @@ xxx="$xxx LOST PHONE PIPE POLL PROF PWR QUIT SEGV STKFLT STOP SYS TERM TRAP"
 xxx="$xxx TSTP TTIN TTOU URG USR1 USR2 USR3 USR4 VTALRM"
 xxx="$xxx WINCH WIND WINDOW XCPU XFSZ"
 : generate a few handy files for later
-$cat > signal.c <<'EOP'
+$cat > signal.c <<'EOCP'
 #include <sys/types.h>
 #include <signal.h>
+#include <stdio.h>
 int main() {
 
 /* Strange style to avoid deeply-nested #if/#else/#endif */
@@ -9060,8 +10626,11 @@ int main() {
 
 printf("NSIG %d\n", NSIG);
 
-EOP
-echo $xxx | $tr ' ' '\012' | $sort | $uniq | $awk '
+#ifndef JUST_NSIG
+
+EOCP
+
+echo $xxx | $tr ' ' $trnl | $sort | $uniq | $awk '
 {
 	printf "#ifdef SIG"; printf $1; printf "\n"
 	printf "printf(\""; printf $1; printf " %%d\\n\",SIG";
@@ -9069,6 +10638,7 @@ echo $xxx | $tr ' ' '\012' | $sort | $uniq | $awk '
 	printf "#endif\n"
 }
 END {
+	printf "#endif /* JUST_NSIG */\n";
 	printf "}\n";
 }
 ' >>signal.c
@@ -9105,42 +10675,95 @@ END {
 EOP
 $cat >signal_cmd <<EOS
 $startsh
-$test -s signal.lst && exit 0
-if $cc $ccflags $ldflags signal.c -o signal >/dev/null 2>&1; then
-	./signal | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+if $test -s signal.lst; then
+    echo "Using your existing signal.lst file"
+	exit 0
+fi
+xxx="$xxx"
+EOS
+$cat >>signal_cmd <<'EOS'
+
+set signal
+if eval $compile_ok; then
+	./signal$_exe | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
 else
-	echo "(I can't seem be able to compile the test program -- Guessing)"
+	echo "(I can't seem be able to compile the whole test program)" >&4
+	echo "(I'll try it in little pieces.)" >&4
+	set signal -DJUST_NSIG
+	if eval $compile_ok; then
+		./signal$_exe > signal.nsg
+		$cat signal.nsg
+	else
+		echo "I can't seem to figure out how many signals you have." >&4
+		echo "Guessing 50." >&4
+		echo 'NSIG 50' > signal.nsg
+	fi
+	: Now look at all the signal names, one at a time.
+	for xx in `echo $xxx | $tr ' ' $trnl | $sort | $uniq`; do
+		$cat > signal.c <<EOCP
+#include <sys/types.h>
+#include <signal.h>
+#include <stdio.h>
+int main() {
+printf("$xx %d\n", SIG${xx});
+return 0;
+}
+EOCP
+		set signal
+		if eval $compile; then
+			echo "SIG${xx} found."
+			./signal$_exe  >> signal.ls1
+		else
+			echo "SIG${xx} NOT found."
+		fi
+	done
+	if $test -s signal.ls1; then
+		$cat signal.nsg signal.ls1 |
+			$sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+	fi
+
+fi
+if $test -s signal.lst; then
+	:
+else
+	echo "(AAK! I can't compile the test programs -- Guessing)" >&4
 	echo 'kill -l' >signal
-	set X \`csh -f <signal\`
+	set X `csh -f <signal`
 	$rm -f signal
 	shift
-	case \$# in
+	case $# in
 	0) set HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM;;
 	esac
-	echo \$@ | $tr ' ' '\012' | \
-		$awk '{ printf \$1; printf " %d\n", ++s; }' >signal.lst
+	echo $@ | $tr ' ' $trnl | \
+		$awk '{ printf $1; printf " %d\n", ++s; }' >signal.lst
 fi
-$rm -f signal.c signal signal.o
+$rm -f signal.c signal$_exe signal$_o signal.nsg signal.ls1
 EOS
 chmod a+x signal_cmd
 $eunicefix signal_cmd
 
 : generate list of signal names
 echo " "
-case "$sig_name" in
-'')	sig_num='' ;;
-esac
-case "$sig_num" in
-'')	sig_name='' ;;
+case "$sig_name_init" in
+'') doinit=yes ;;
+*)  case "$sig_num_init" in
+    ''|*,*) doinit=yes ;;
+    esac ;;
 esac
-case "$sig_name" in
-'')
+case "$doinit" in
+yes)
 	echo "Generating a list of signal names and numbers..." >&4
-	./signal_cmd
+	. ./signal_cmd
 	sig_name=`$awk '{printf "%s ", $1}' signal.lst`
 	sig_name="ZERO $sig_name"
+	sig_name_init=`$awk 'BEGIN { printf "\"ZERO\", " }
+						{ printf "\"%s\", ", $1 }
+						END { printf "0\n" }' signal.lst`
 	sig_num=`$awk '{printf "%d ", $2}' signal.lst`
 	sig_num="0 $sig_num"
+	sig_num_init=`$awk 'BEGIN { printf "0, " }
+					{ printf "%d, ", $2}
+					END { printf "0\n"}' signal.lst`
 	;;
 esac
 echo "The following signals are available:"
@@ -9161,15 +10784,6 @@ echo $sig_name | $awk \
 }'
 $rm -f signal signal.c signal.awk signal.lst signal_cmd 
 
-: see what type is used for size_t
-set size_t sizetype 'unsigned int' stdio.h sys/types.h
-eval $typedef
-dflt="$sizetype"
-echo " "
-rp="What type is used for the length parameter for string functions?"
-. ./myread
-sizetype="$ans"
-
 : see what type is used for signed size_t
 set ssize_t ssizetype int stdio.h sys/types.h
 eval $typedef
@@ -9179,7 +10793,7 @@ $cat > ssize.c <<EOM
 #include <sys/types.h>
 #define Size_t $sizetype
 #define SSize_t $dflt
-main()
+int main()
 {
 	if (sizeof(Size_t) == sizeof(SSize_t))
 		printf("$dflt\n");
@@ -9187,23 +10801,16 @@ main()
 		printf("int\n");
 	else 
 		printf("long\n");
-	fflush(stdout);
 	exit(0);
 }
 EOM
 echo " "
-#	If $libs contains -lsfio, and sfio is mis-configured, then it
-#	sometimes (apparently) runs and exits with a 0 status, but with no
-#	output!.  Thus we check with test -s whether we actually got any 
-#	output.  I think it has to do with sfio's use of _exit vs. exit,
-#	but I don't know for sure.  --Andy Dougherty  1/27/97.
-if $cc $optimize $ccflags $ldflags -o ssize ssize.c $libs > /dev/null 2>&1  &&
-		./ssize > ssize.out 2>/dev/null && test -s ssize.out ; then
-	ssizetype=`$cat ssize.out`
+set ssize
+if eval $compile_ok && ./ssize > /dev/null; then
+	ssizetype=`./ssize`
 	echo "I'll be using $ssizetype for functions returning a byte count." >&4
 else
 	$cat >&4 <<EOM
-
 Help! I can't compile and run the ssize_t 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.)
@@ -9216,7 +10823,7 @@ EOM
 	. ./myread
 	ssizetype="$ans"
 fi
-$rm -f ssize ssize.[co] ssize.out
+$rm -f ssize ssize.*
 
 : see what type of char stdio uses.
 echo " "
@@ -9230,25 +10837,25 @@ fi
 
 : see if time exists
 echo " "
-if set time val -f d_time; eval $csym; $val; then
+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
-	dflt="$timetype"
-	echo " "
-	rp="What type is returned by time() on this system?"
-	. ./myread
-	timetype="$ans"
-else
+	eval $typedef_ask
+    else
 	echo 'time() not found, hope that will do.' >&4
 	val="$undef"
 	timetype='int';
+    fi
+    set d_time
+    eval $setvar
 fi
-set d_time
-eval $setvar
 
 : see what type uids are declared as in the kernel
+echo " "
+echo "Looking for the type for user ids returned by getuid()."
 set uid_t uidtype xxx stdio.h sys/types.h
 eval $typedef
 case "$uidtype" in
@@ -9262,10 +10869,13 @@ xxx)
 	;;
 *) dflt="$uidtype";;
 esac
-echo " "
-rp="What is the type for user ids returned by getuid()?"
-. ./myread
-uidtype="$ans"
+case "$uidtype" in
+uid_t)	echo "uid_t found." ;;
+*)	rp="What is the type for user ids returned by getuid()?"
+	. ./myread
+	uidtype="$ans"
+	;;
+esac
 
 : see if dbm.h is available
 : see if dbmclose exists
@@ -9354,6 +10964,42 @@ eval $setvar
 set grp.h i_grp
 eval $inhdr
 
+case "$i_grp" in
+$define)
+	: see if setgrent exists
+	set setgrent d_setgrent
+	eval $inlibc
+
+	: see if getgrent exists
+	set getgrent d_getgrent
+	eval $inlibc
+
+	: see if endgrent exists
+	set endgrent d_endgrent
+	eval $inlibc
+
+	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
+	;;
+*)	# Assume all is lost as far as the d_*gr* go.
+	val="$undef"; 
+	set d_setgrent; eval $setvar
+	set d_getgrent; eval $setvar
+	set d_endgrent; eval $setvar
+	set d_grpasswd; eval $setvar
+	;;
+esac
+
 : see if locale.h is available
 set locale.h i_locale
 eval $inhdr
@@ -9414,7 +11060,7 @@ eval $setvar
 : get C preprocessor symbols handy
 echo " "
 $echo $n "Hmm... $c"
-echo $al | $tr ' ' '\012' >Cppsym.know
+echo $al | $tr ' ' $trnl >Cppsym.know
 $cat <<EOSS >Cppsym
 $startsh
 case "\$1" in
@@ -9441,7 +11087,7 @@ esac
 case \$# in
 0) exit 1;;
 esac
-echo \$* | $tr ' ' '\012' | $sed -e 's/\(.*\)/\\
+echo \$* | $tr ' ' '$trnl' | $sed -e 's/\(.*\)/\\
 #ifdef \1\\
 exit 0; _ _ _ _\1\\	 \1\\
 #endif\\
@@ -9463,12 +11109,16 @@ $eunicefix Cppsym
 ./Cppsym -l $al | $sort | $grep -v '^$' >Cppsym.true
 
 : now check the C compiler for additional symbols
+postprocess_cc_v=''
+case "$osname" in
+aix) postprocess_cc_v="|$tr , ' '" ;;
+esac
 $cat >ccsym <<EOS
 $startsh
 $cat >tmp.c <<EOF
 extern int foo;
 EOF
-for i in \`$cc -v -c tmp.c 2>&1\`
+for i in \`$cc -v -c tmp.c 2>&1 $postprocess_cc_v\`
 do
 	case "\$i" in
 	-D*) echo "\$i" | $sed 's/^-D//';;
@@ -9477,9 +11127,16 @@ do
 done
 $rm -f try.c
 EOS
+unset postprocess_cc_v
 chmod +x ccsym
 $eunicefix ccsym
-./ccsym | $sort | $uniq >ccsym.raw
+./ccsym > ccsym1.raw
+if $test -s ccsym1.raw; then
+       $sort ccsym1.raw | $uniq >ccsym.raw
+else
+       mv ccsym1.raw ccsym.raw
+fi
+
 $awk '/\=/ { print $0; next }
 	{ print $0"=1" }' ccsym.raw >ccsym.list
 $awk '{ print $0"=1" }' Cppsym.true >ccsym.true
@@ -9487,12 +11144,15 @@ $comm -13 ccsym.true ccsym.list >ccsym.own
 $comm -12 ccsym.true ccsym.list >ccsym.com
 $comm -23 ccsym.true ccsym.list >ccsym.cpp
 also=''
-symbols='symbols'
 if $test -z ccsym.raw; then
 	echo "Your C compiler doesn't seem to define any symbol!" >&4
 	echo " "
 	echo "However, your C preprocessor defines the following ones:"
 	$cat Cppsym.true
+    	ccsymbols=''
+	cppsymbols=`$cat Cppsym.true`
+        cppsymbols=`echo $cppsymbols`
+	cppccsymbols="$cppsymbols"
 else
 	if $test -s ccsym.com; then
 		echo "Your C compiler and pre-processor define these symbols:"
@@ -9500,20 +11160,26 @@ else
 		also='also '
 		symbols='ones'
 		$test "$silent" || sleep 1
+		cppccsymbols=`$cat ccsym.com`
+		cppccsymbols=`echo $cppccsymbols`
 	fi
 	if $test -s ccsym.cpp; then
 		$test "$also" && echo " "
-		echo "Your C pre-processor ${also}defines the following $symbols:"
+		echo "Your C pre-processor ${also}defines the following symbols:"
 		$sed -e 's/\(.*\)=.*/\1/' ccsym.cpp
 		also='further '
 		$test "$silent" || sleep 1
+		cppsymbols=`$cat ccsym.cpp`
+		cppsymbols=`echo $cppsymbols`
 	fi
 	if $test -s ccsym.own; then
 		$test "$also" && echo " "
-		echo "Your C compiler ${also}defines the following cpp variables:"
+		echo "Your C compiler ${also}defines the following cpp symbols:"
 		$sed -e 's/\(.*\)=1/\1/' ccsym.own
 		$sed -e 's/\(.*\)=.*/\1/' ccsym.own | $uniq >>Cppsym.true
 		$test "$silent" || sleep 1
+	        ccsymbols=`$cat ccsym.own`
+	        ccsymbols=`echo $ccsymbols`
 	fi
 fi
 $rm -f ccsym*
@@ -9627,7 +11293,7 @@ if $cc -c $ccflags -D\$1 varargs.c >/dev/null 2>&1; then
 else
 	echo "false"
 fi
-$rm -f varargs.o
+$rm -f varargs$_o
 EOP
 chmod +x varargs
 
@@ -9696,22 +11362,10 @@ fi
 set i_sysioctl
 eval $setvar
 
-: see if this is a sys/param system
-set sys/param.h i_sysparam
-eval $inhdr
-
 : see if sys/resource.h has to be included
 set sys/resource.h i_sysresrc
 eval $inhdr
 
-: see if sys/stat.h is available
-set sys/stat.h i_sysstat
-eval $inhdr
-
-: see if sys/types.h has to be included
-set sys/types.h i_systypes
-eval $inhdr
-
 : see if this is a sys/un.h system
 set sys/un.h i_sysun
 eval $inhdr
@@ -9761,78 +11415,121 @@ eval $setvar
 
 echo " "
 echo "Looking for extensions..." >&4
-cd ../ext
+tdir=`pwd`
+cd $rsrc/ext
 : If we are using the old config.sh, known_extensions may contain
 : old or inaccurate or duplicate values.
 known_extensions=''
+nonxs_extensions=''
 : We do not use find because it might not be available.
 : We do not just use MANIFEST because the user may have dropped
 : some additional extensions into the source tree and expect them
 : to be built.
 for xxx in * ; do
-    case "$xxx" in
-    DynaLoader) ;;
-    *)	if $test -f $xxx/$xxx.xs; then
-	    known_extensions="$known_extensions $xxx"
-	else
-	    if $test -d $xxx; then
-		cd $xxx
-		for yyy in * ; do
-		    if $test -f $yyy/$yyy.xs; then
-			known_extensions="$known_extensions $xxx/$yyy"
-		    fi
-		done
-		cd ..
-	    fi
-	fi ;;
-    esac
+	case "$xxx" in
+	DynaLoader|dynaload) ;;
+	*)	if $test -f $xxx/$xxx.xs; then
+			known_extensions="$known_extensions $xxx"
+		elif $test -f $xxx/Makefile.PL; then
+			nonxs_extensions="$nonxs_extensions $xxx"
+		else
+			if $test -d $xxx; then
+				# Look for nested extensions, eg. Devel/Dprof.
+				cd $xxx
+				for yyy in * ; do
+				if $test -f $yyy/$yyy.xs; then
+					known_extensions="$known_extensions $xxx/$yyy"
+				elif $test -f $yyy/Makefile.PL; then
+					nonxs_extensions="$nonxs_extensions $xxx/$yyy"
+				fi
+				done
+				cd ..
+			fi
+		fi 
+		;;
+	esac
 done
+set X $nonxs_extensions
+shift
+nonxs_extensions="$*"
 set X $known_extensions
 shift
 known_extensions="$*"
-cd ../UU
+cd $tdir
 
 : Now see which are supported on this system.
 avail_ext=''
 for xxx in $known_extensions ; do
-    case "$xxx" in
-    DB_File) case "$i_db" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    GDBM_File) case "$i_gdbm" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    NDBM_File) case "$i_ndbm" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    ODBM_File) case "${i_dbm}${i_rpcsvcdbm}" in 
-	    *"${define}"*) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    POSIX) case "$useposix" in 
-	    true|define|y) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    Opcode) case "$useopcode" in 
-	    true|define|y) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    Socket) case "$d_socket" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
-	    esac
-	    ;;
-    *)      avail_ext="$avail_ext $xxx"
-	    ;;
-    esac
+	case "$xxx" in
+	DB_File|db_file)
+		case "$i_db" in
+		$define) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	GDBM_File|gdbm_fil)
+		case "$i_gdbm" in 
+		$define) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	NDBM_File|ndbm_fil)
+		case "$i_ndbm" in
+		$define) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	ODBM_File|odbm_fil) 
+		case "${i_dbm}${i_rpcsvcdbm}" in
+		*"${define}"*) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	POSIX|posix)
+		case "$useposix" in
+		true|define|y) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	Opcode|opcode)
+		case "$useopcode" in
+		true|define|y) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	Socket|socket)
+		case "$d_socket" in 
+		true|$define|y) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	Thread|thread)
+		case "$usethreads" in 
+		true|$define|y) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	IPC/SysV|ipc/sysv)
+		: XXX Do we need a useipcsysv variable here
+		case "${d_msg}${d_sem}${d_shm}" in 
+		*"${define}"*) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
+	*)	avail_ext="$avail_ext $xxx"
+		;;
+	esac
 done
 
 set X $avail_ext
 shift
 avail_ext="$*"
 
+: Now see which nonxs extensions are supported on this system.
+: For now assume all are.
+nonxs_ext=''
+for xxx in $nonxs_extensions ; do
+	case "$xxx" in
+	*)	nonxs_ext="$nonxs_ext $xxx"
+		;;
+	esac
+done
+
+set X $nonxs_ext
+shift
+nonxs_ext="$*"
+
 case $usedl in
 $define)
 	$cat <<EOM
@@ -9840,11 +11537,28 @@ A number of extensions are supplied with $package.  You may choose to
 compile these extensions for dynamic loading (the default), compile
 them into the $package executable (static loading), or not include
 them at all.  Answer "none" to include no extensions.
+Note that DynaLoader is always built and need not be mentioned here.
 
 EOM
 	case "$dynamic_ext" in
 	'') dflt="$avail_ext" ;;
-	*)	dflt="$dynamic_ext" ;;
+	*)	dflt="$dynamic_ext"
+		# Perhaps we are reusing an old out-of-date config.sh.
+		case "$hint" in
+		previous)
+			if test X"$dynamic_ext" != X"$avail_ext"; then
+				$cat <<EOM
+NOTICE:  Your previous config.sh list may be incorrect. 
+The extensions now available to you are 
+	${avail_ext}
+but the default list from your previous config.sh is
+	${dynamic_ext} 
+
+EOM
+			fi
+			;;
+		esac
+		;;
 	esac
 	case "$dflt" in
 	'')	dflt=none;;
@@ -9888,13 +11602,30 @@ EOM
 	$cat <<EOM
 A number of extensions are supplied with $package.  Answer "none" 
 to include no extensions. 
+Note that DynaLoader is always built and need not be mentioned here.
 
 EOM
 	case "$static_ext" in
 	'') dflt="$avail_ext" ;;
-	*)	dflt="$static_ext" ;;
-	esac
+	*)	dflt="$static_ext"
+		# Perhaps we are reusing an old out-of-date config.sh.
+		case "$hint" in
+		previous)
+			if test X"$static_ext" != X"$avail_ext"; then
+				$cat <<EOM
+NOTICE:  Your previous config.sh list may be incorrect. 
+The extensions now available to you are 
+	${avail_ext}
+but the default list from your previous config.sh is
+	${static_ext} 
 
+EOM
+			fi
+			;;
+		esac
+		;;
+	esac
+	: Exclude those that are not xs extensions
 	case "$dflt" in
 	'')	dflt=none;;
 	esac
@@ -9907,7 +11638,7 @@ EOM
 	;;
 esac
 
-set X $dynamic_ext $static_ext
+set X $dynamic_ext $static_ext $nonxs_ext
 shift
 extensions="$*"
 
@@ -9954,7 +11685,9 @@ case "$d_portable" in
 	echo " "
 	echo "Stripping down executable paths..." >&4
 	for file in $loclist $trylist; do
-		eval $file="\$file"
+		if test X$file != Xln -a X$file != Xar -o X$osname != Xos2; then
+			eval $file="\$file"
+		fi
 	done
 	;;
 esac
@@ -9965,15 +11698,17 @@ echo "Creating config.sh..." >&4
 $spitshell <<EOT >config.sh
 $startsh
 #
-# This file was produced by running the Configure script.  It holds all
-# the definitions figured out by Configure.  Should you modify any of
-# these values, do not forget to propagate your changes by running
-# "Configure -S"; or, equivalently, you may run each .SH file yourself.
+# This file was produced by running the Configure script. It holds all the
+# definitions figured out by Configure. Should you modify one of these values,
+# do not forget to propagate your changes by running "Configure -der". You may
+# instead choose to run each of the .SH files by yourself, or "Configure -S".
 #
 
+# Package name      : $package
+# Source directory  : $src
 # Configuration time: $cf_time
-# Configured by: $cf_by
-# Target system: $myuname
+# Configured by     : $cf_by
+# Target system     : $myuname
 
 Author='$Author'
 Date='$Date'
@@ -9986,9 +11721,14 @@ RCSfile='$RCSfile'
 Revision='$Revision'
 Source='$Source'
 State='$State'
+_a='$_a'
+_exe='$_exe'
+_o='$_o'
 afs='$afs'
 alignbytes='$alignbytes'
+ansi2knr='$ansi2knr'
 aphostname='$aphostname'
+apiversion='$apiversion'
 ar='$ar'
 archlib='$archlib'
 archlibexp='$archlibexp'
@@ -9998,7 +11738,6 @@ awk='$awk'
 baserev='$baserev'
 bash='$bash'
 bin='$bin'
-bincompat3='$bincompat3'
 binexp='$binexp'
 bison='$bison'
 byacc='$byacc'
@@ -10010,6 +11749,7 @@ cc='$cc'
 cccdlflags='$cccdlflags'
 ccdlflags='$ccdlflags'
 ccflags='$ccflags'
+ccsymbols='$ccsymbols'
 cf_by='$cf_by'
 cf_email='$cf_email'
 cf_time='$cf_time'
@@ -10029,6 +11769,8 @@ cpplast='$cpplast'
 cppminus='$cppminus'
 cpprun='$cpprun'
 cppstdin='$cppstdin'
+cppsymbols='$cppsymbols'
+cppccsymbols='$cppccsymbols'
 cryptlib='$cryptlib'
 csh='$csh'
 d_Gconvert='$d_Gconvert'
@@ -10038,10 +11780,8 @@ d_archlib='$d_archlib'
 d_attribut='$d_attribut'
 d_bcmp='$d_bcmp'
 d_bcopy='$d_bcopy'
-d_bincompat3='$d_bincompat3'
 d_bsd='$d_bsd'
 d_bsdgetpgrp='$d_bsdgetpgrp'
-d_bsdpgrp='$d_bsdpgrp'
 d_bsdsetpgrp='$d_bsdsetpgrp'
 d_bzero='$d_bzero'
 d_casti32='$d_casti32'
@@ -10063,6 +11803,12 @@ d_dlopen='$d_dlopen'
 d_dlsymun='$d_dlsymun'
 d_dosuid='$d_dosuid'
 d_dup2='$d_dup2'
+d_endgrent='$d_endgrent'
+d_endhent='$d_endhent'
+d_endnent='$d_endnent'
+d_endpent='$d_endpent'
+d_endpwent='$d_endpwent'
+d_endsent='$d_endsent'
 d_eofnblk='$d_eofnblk'
 d_eunice='$d_eunice'
 d_fchmod='$d_fchmod'
@@ -10077,27 +11823,52 @@ d_flock='$d_flock'
 d_fork='$d_fork'
 d_fpathconf='$d_fpathconf'
 d_fsetpos='$d_fsetpos'
+d_fstatfs='$d_fstatfs'
+d_statfsflags='$d_statfsflags'
+d_fstatvfs='$d_fstatvfs'
+d_getmntent='$d_getmntent'
+d_hasmntopt='$d_hasmntopt'
 d_ftime='$d_ftime'
+d_getgrent='$d_getgrent'
 d_getgrps='$d_getgrps'
-d_setgrps='$d_setgrps'
+d_gethbyaddr='$d_gethbyaddr'
+d_gethbyname='$d_gethbyname'
 d_gethent='$d_gethent'
 d_gethname='$d_gethname'
+d_gethostprotos='$d_gethostprotos'
 d_getlogin='$d_getlogin'
+d_getnbyaddr='$d_getnbyaddr'
+d_getnbyname='$d_getnbyname'
+d_getnent='$d_getnent'
+d_getnetprotos='$d_getnetprotos'
+d_getpbyname='$d_getpbyname'
+d_getpbynumber='$d_getpbynumber'
+d_getpent='$d_getpent'
 d_getpgid='$d_getpgid'
 d_getpgrp2='$d_getpgrp2'
 d_getpgrp='$d_getpgrp'
 d_getppid='$d_getppid'
 d_getprior='$d_getprior'
+d_getprotoprotos='$d_getprotoprotos'
+d_getpwent='$d_getpwent'
+d_getsbyname='$d_getsbyname'
+d_getsbyport='$d_getsbyport'
+d_getsent='$d_getsent'
+d_getservprotos='$d_getservprotos'
 d_gettimeod='$d_gettimeod'
 d_gnulibc='$d_gnulibc'
+d_grpasswd='$d_grpasswd'
 d_htonl='$d_htonl'
 d_index='$d_index'
 d_inetaton='$d_inetaton'
 d_isascii='$d_isascii'
 d_killpg='$d_killpg'
+d_lchown='$d_lchown'
 d_link='$d_link'
 d_locconv='$d_locconv'
 d_lockf='$d_lockf'
+d_longdbl='$d_longdbl'
+d_longlong='$d_longlong'
 d_lstat='$d_lstat'
 d_mblen='$d_mblen'
 d_mbstowcs='$d_mbstowcs'
@@ -10116,7 +11887,7 @@ d_msgrcv='$d_msgrcv'
 d_msgsnd='$d_msgsnd'
 d_mymalloc='$d_mymalloc'
 d_nice='$d_nice'
-d_oldarchlib='$d_oldarchlib'
+d_oldpthreads='$d_oldpthreads'
 d_oldsock='$d_oldsock'
 d_open3='$d_open3'
 d_pathconf='$d_pathconf'
@@ -10125,12 +11896,16 @@ d_phostname='$d_phostname'
 d_pipe='$d_pipe'
 d_poll='$d_poll'
 d_portable='$d_portable'
+d_pthread_yield='$d_pthread_yield'
+d_pthreads_created_joinable='$d_pthreads_created_joinable'
 d_pwage='$d_pwage'
 d_pwchange='$d_pwchange'
 d_pwclass='$d_pwclass'
 d_pwcomment='$d_pwcomment'
 d_pwexpire='$d_pwexpire'
+d_pwgecos='$d_pwgecos'
 d_pwquota='$d_pwquota'
+d_pwpasswd='$d_pwpasswd'
 d_readdir='$d_readdir'
 d_readlink='$d_readlink'
 d_rename='$d_rename'
@@ -10139,27 +11914,38 @@ d_rmdir='$d_rmdir'
 d_safebcpy='$d_safebcpy'
 d_safemcpy='$d_safemcpy'
 d_sanemcmp='$d_sanemcmp'
+d_sched_yield='$d_sched_yield'
 d_seekdir='$d_seekdir'
 d_select='$d_select'
 d_sem='$d_sem'
 d_semctl='$d_semctl'
+d_semctl_semid_ds='$d_semctl_semid_ds'
+d_semctl_semun='$d_semctl_semun'
 d_semget='$d_semget'
 d_semop='$d_semop'
 d_setegid='$d_setegid'
 d_seteuid='$d_seteuid'
+d_setgrent='$d_setgrent'
+d_setgrps='$d_setgrps'
+d_sethent='$d_sethent'
 d_setlinebuf='$d_setlinebuf'
 d_setlocale='$d_setlocale'
+d_setnent='$d_setnent'
+d_setpent='$d_setpent'
 d_setpgid='$d_setpgid'
 d_setpgrp2='$d_setpgrp2'
 d_setpgrp='$d_setpgrp'
 d_setprior='$d_setprior'
+d_setpwent='$d_setpwent'
 d_setregid='$d_setregid'
 d_setresgid='$d_setresgid'
 d_setresuid='$d_setresuid'
 d_setreuid='$d_setreuid'
 d_setrgid='$d_setrgid'
 d_setruid='$d_setruid'
+d_setsent='$d_setsent'
 d_setsid='$d_setsid'
+d_setvbuf='$d_setvbuf'
 d_sfio='$d_sfio'
 d_shm='$d_shm'
 d_shmat='$d_shmat'
@@ -10201,6 +11987,7 @@ d_truncate='$d_truncate'
 d_tzname='$d_tzname'
 d_umask='$d_umask'
 d_uname='$d_uname'
+d_union_semun='$d_union_semun'
 d_vfork='$d_vfork'
 d_void_closedir='$d_void_closedir'
 d_voidsig='$d_voidsig'
@@ -10219,8 +12006,10 @@ defvoidused='$defvoidused'
 direntrytype='$direntrytype'
 dlext='$dlext'
 dlsrc='$dlsrc'
+doublesize='$doublesize'
 dynamic_ext='$dynamic_ext'
 eagain='$eagain'
+ebcdic='$ebcdic'
 echo='$echo'
 egrep='$egrep'
 emacs='$emacs'
@@ -10233,9 +12022,9 @@ firstmakefile='$firstmakefile'
 flex='$flex'
 fpostype='$fpostype'
 freetype='$freetype'
+full_ar='$full_ar'
 full_csh='$full_csh'
 full_sed='$full_sed'
-gcc='$gcc'
 gccversion='$gccversion'
 gidtype='$gidtype'
 glibpth='$glibpth'
@@ -10248,6 +12037,7 @@ h_sysfile='$h_sysfile'
 hint='$hint'
 hostcat='$hostcat'
 huge='$huge'
+i_arpainet='$i_arpainet'
 i_bsdioctl='$i_bsdioctl'
 i_db='$i_db'
 i_dbm='$i_dbm'
@@ -10261,12 +12051,16 @@ i_grp='$i_grp'
 i_limits='$i_limits'
 i_locale='$i_locale'
 i_malloc='$i_malloc'
+i_machcthreads='$i_machcthreads'
 i_math='$i_math'
 i_memory='$i_memory'
+i_mntent='$i_mntent'
 i_ndbm='$i_ndbm'
+i_netdb='$i_netdb'
 i_neterrno='$i_neterrno'
 i_niin='$i_niin'
 i_pwd='$i_pwd'
+i_pthread='$i_pthread'
 i_rpcsvcdbm='$i_rpcsvcdbm'
 i_sfio='$i_sfio'
 i_sgtty='$i_sgtty'
@@ -10279,12 +12073,14 @@ i_sysfile='$i_sysfile'
 i_sysfilio='$i_sysfilio'
 i_sysin='$i_sysin'
 i_sysioctl='$i_sysioctl'
+i_sysmount='$i_sysmount'
 i_sysndir='$i_sysndir'
 i_sysparam='$i_sysparam'
 i_sysresrc='$i_sysresrc'
 i_sysselct='$i_sysselct'
 i_syssockio='$i_syssockio'
 i_sysstat='$i_sysstat'
+i_sysstatvfs='$i_sysstatvfs'
 i_systime='$i_systime'
 i_systimek='$i_systimek'
 i_systimes='$i_systimes'
@@ -10300,6 +12096,7 @@ i_values='$i_values'
 i_varargs='$i_varargs'
 i_varhdr='$i_varhdr'
 i_vfork='$i_vfork'
+ignore_versioned_solibs='$ignore_versioned_solibs'
 incpath='$incpath'
 inews='$inews'
 installarchlib='$installarchlib'
@@ -10310,6 +12107,7 @@ installprivlib='$installprivlib'
 installscript='$installscript'
 installsitearch='$installsitearch'
 installsitelib='$installsitelib'
+installusrbinperl='$installusrbinperl'
 intsize='$intsize'
 known_extensions='$known_extensions'
 ksh='$ksh'
@@ -10331,6 +12129,8 @@ ln='$ln'
 lns='$lns'
 locincpth='$locincpth'
 loclibpth='$loclibpth'
+longdblsize='$longdblsize'
+longlongsize='$longlongsize'
 longsize='$longsize'
 lp='$lp'
 lpr='$lpr'
@@ -10362,13 +12162,17 @@ mydomain='$mydomain'
 myhostname='$myhostname'
 myuname='$myuname'
 n='$n'
+netdb_hlen_type='$netdb_hlen_type'
+netdb_host_type='$netdb_host_type'
+netdb_name_type='$netdb_name_type'
+netdb_net_type='$netdb_net_type'
+nm='$nm'
 nm_opt='$nm_opt'
 nm_so_opt='$nm_so_opt'
+nonxs_ext='$nonxs_ext'
 nroff='$nroff'
 o_nonblock='$o_nonblock'
 obj_ext='$obj_ext'
-oldarchlib='$oldarchlib'
-oldarchlibexp='$oldarchlibexp'
 optimize='$optimize'
 orderlib='$orderlib'
 osname='$osname'
@@ -10383,6 +12187,7 @@ perladmin='$perladmin'
 perlpath='$perlpath'
 pg='$pg'
 phostname='$phostname'
+pidtype='$pidtype'
 plibpth='$plibpth'
 pmake='$pmake'
 pr='$pr'
@@ -10391,6 +12196,7 @@ prefixexp='$prefixexp'
 privlib='$privlib'
 privlibexp='$privlibexp'
 prototype='$prototype'
+ptrsize='$ptrsize'
 randbits='$randbits'
 ranlib='$ranlib'
 rd_nodata='$rd_nodata'
@@ -10400,6 +12206,7 @@ runnm='$runnm'
 scriptdir='$scriptdir'
 scriptdirexp='$scriptdirexp'
 sed='$sed'
+selectminbits='$selectminbits'
 selecttype='$selecttype'
 sendmail='$sendmail'
 sh='$sh'
@@ -10410,7 +12217,9 @@ shortsize='$shortsize'
 shrpenv='$shrpenv'
 shsharp='$shsharp'
 sig_name='$sig_name'
+sig_name_init='$sig_name_init'
 sig_num='$sig_num'
+sig_num_init='$sig_num_init'
 signal_t='$signal_t'
 sitearch='$sitearch'
 sitearchexp='$sitearchexp'
@@ -10427,6 +12236,7 @@ sort='$sort'
 spackage='$spackage'
 spitshell='$spitshell'
 split='$split'
+src='$src'
 ssizetype='$ssizetype'
 startperl='$startperl'
 startsh='$startsh'
@@ -10435,6 +12245,7 @@ stdchar='$stdchar'
 stdio_base='$stdio_base'
 stdio_bufsiz='$stdio_bufsiz'
 stdio_cnt='$stdio_cnt'
+stdio_filbuf='$stdio_filbuf'
 stdio_ptr='$stdio_ptr'
 strings='$strings'
 submit='$submit'
@@ -10443,11 +12254,13 @@ sysman='$sysman'
 tail='$tail'
 tar='$tar'
 tbl='$tbl'
+tee='$tee'
 test='$test'
 timeincl='$timeincl'
 timetype='$timetype'
 touch='$touch'
 tr='$tr'
+trnl='$trnl'
 troff='$troff'
 uidtype='$uidtype'
 uname='$uname'
@@ -10460,9 +12273,11 @@ useperlio='$useperlio'
 useposix='$useposix'
 usesfio='$usesfio'
 useshrplib='$useshrplib'
+usethreads='$usethreads'
 usevfork='$usevfork'
 usrinc='$usrinc'
 uuname='$uuname'
+version='$version'
 vi='$vi'
 voidflags='$voidflags'
 xlibpth='$xlibpth'
@@ -10470,9 +12285,12 @@ zcat='$zcat'
 zip='$zip'
 EOT
 
+: Add in command line options if available
+$test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh
+
 : add special variables
-$test -f patchlevel.h && \
-awk '/^#define/ {printf "%s=%s\n",$2,$3}' patchlevel.h >>config.sh
+$test -f $src/patchlevel.h && \
+awk '/^#define/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh
 echo "CONFIG=true" >>config.sh
 
 : propagate old symbols
@@ -10566,6 +12384,22 @@ else
 	echo "Done."
 fi
 
+if $test -f Policy.sh; then
+    $cat <<EOM
+
+If you compile $package on a different machine or from a different object
+directory, copy the Policy.sh file from this object directory to the
+new one before you run Configure -- this will help you with most of
+the policy defaults.
+
+EOM
+fi
+if $test -f config.msg; then
+    echo "Hmm.  I also noted the following information while running:"
+    echo " "
+    $cat config.msg >&4
+    $rm -f config.msg
+fi
 $rm -f kit*isdone ark*isdone
 $rm -rf UU