Re: ANNOUNCE: perl5.004_60 Configure patch is available

p4raw-id: //depot/perl@575

30 files changed, 3478 insertions, 2412 deletions

diff --git a/Configure b/Configure
index 62249dd580..afba27c076 100755
--- a/Configure
+++ b/Configure
@@ -14,13 +14,13 @@
 # (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 Feb 24 12:36:41 EST 1998 [metaconfig 3.0 PL70]
 
 cat >/tmp/c1$$ <<EOF
 ARGGGHHHH!!!!!
@@ -55,16 +55,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]'`
-fi
-if test -d c:/. -a -n "$DJDIR"; then
-        p_=\;
+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 "$DJDIR"; then
+		p_=\;
+	fi
 fi
 
 : Proper PATH setting
@@ -88,56 +89,58 @@ done
 PATH=.$p_$PATH
 export PATH
 
-: This should not matter in scripts, but apparently it does, sometimes
-case "$CDPATH" in
-'')	;;
-*)	CDPATH='' ;;
-esac
-
-: Sanity checks
-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]*)
+		unset 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
 
 : Configure runs within the UU subdirectory
 test -d UU || mkdir UU
+unset CDPATH
 cd UU && rm -f ./*
 
 dynamic_ext=''
@@ -151,6 +154,7 @@ d_eunice=''
 d_xenix=''
 eunicefix=''
 Mcc=''
+ar=''
 awk=''
 bash=''
 bison=''
@@ -186,6 +190,7 @@ lpr=''
 ls=''
 mail=''
 mailx=''
+make=''
 mkdir=''
 more=''
 mv=''
@@ -212,7 +217,6 @@ tr=''
 troff=''
 uname=''
 uniq=''
-usethreads=''
 uuname=''
 vi=''
 zcat=''
@@ -233,7 +237,9 @@ RCSfile=''
 Revision=''
 Source=''
 State=''
-ar=''
+_a=''
+_exe=''
+_o=''
 archobjs=''
 exe_ext=''
 firstmakefile=''
@@ -315,25 +321,15 @@ d_ftime=''
 d_gettimeod=''
 d_Gconvert=''
 d_getgrps=''
-d_setgrps=''
-d_gethent=''
 d_gethbyaddr=''
-netdb_host_type=''
-netdb_hlen_type=''
 d_gethbyname=''
-netdb_name_type=''
-d_getnbyaddr=''
-d_getnbyname=''
-netdb_net_type=''
+d_gethent=''
 aphostname=''
 d_gethname=''
-d_getpbyname=''
-d_getpbynumber=''
-d_getsbyname=''
-d_getsbyport=''
 d_phostname=''
 d_uname=''
 d_getlogin=''
+d_getnbyaddr=''
 d_getpgid=''
 d_getpgrp2=''
 d_bsdgetpgrp=''
@@ -372,6 +368,9 @@ d_pause=''
 d_pipe=''
 d_poll=''
 d_portable=''
+d_pthread_yield=''
+d_sched_yield=''
+d_pthreads_created_joinable=''
 d_readdir=''
 d_rewinddir=''
 d_seekdir=''
@@ -389,11 +388,11 @@ d_semget=''
 d_semop=''
 d_setegid=''
 d_seteuid=''
+d_setgrps=''
 d_setlinebuf=''
 d_setlocale=''
 d_setpgid=''
 d_setpgrp2=''
-d_bsdpgrp=''
 d_bsdsetpgrp=''
 d_setpgrp=''
 d_setprior=''
@@ -428,6 +427,7 @@ d_stdstdio=''
 stdio_base=''
 stdio_bufsiz=''
 stdio_cnt=''
+stdio_filbuf=''
 stdio_ptr=''
 d_index=''
 d_strchr=''
@@ -475,8 +475,6 @@ usedl=''
 fpostype=''
 gidtype=''
 groupstype=''
-d_sched_yield=''
-d_pthread_yield=''
 h_fcntl=''
 h_sysfile=''
 db_hashtype=''
@@ -503,7 +501,6 @@ i_netdb=''
 i_neterrno=''
 i_niin=''
 i_sysin=''
-d_pthreads_created_joinable=''
 d_pwage=''
 d_pwchange=''
 d_pwclass=''
@@ -561,7 +558,6 @@ xlibpth=''
 libs=''
 lns=''
 lseektype=''
-make=''
 make_set_make=''
 d_mymalloc=''
 freetype=''
@@ -593,12 +589,13 @@ 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=''
@@ -608,6 +605,7 @@ patchlevel=''
 subversion=''
 perladmin=''
 perlpath=''
+pidtype=''
 prefix=''
 prefixexp=''
 installprivlib=''
@@ -621,6 +619,7 @@ scriptdirexp=''
 selecttype=''
 sh=''
 sig_name=''
+sig_name_init=''
 sig_num=''
 installsitearch=''
 sitearch=''
@@ -633,6 +632,7 @@ so=''
 sharpbang=''
 shsharp=''
 spitshell=''
+src=''
 ssizetype=''
 startperl=''
 startsh=''
@@ -644,6 +644,7 @@ nm_so_opt=''
 runnm=''
 usenm=''
 useperlio=''
+usethreads=''
 incpath=''
 mips=''
 mips_type=''
@@ -731,26 +732,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'
 
@@ -759,7 +741,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"
@@ -769,9 +751,29 @@ glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
 : machines, like the mips.  Usually, it should be empty.
 plibpth=''
 
+: default library list
+libswanted=''
 : full support for void wanted by default
 defvoidused=15
 
+: 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=''
+: 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'
 libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
@@ -786,8 +788,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';;
@@ -805,11 +805,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
@@ -820,9 +818,10 @@ 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 me (Andy Dougherty) at doughera@lafcol.lafayette.edu and 
+we'll try to straighten this all out.
 EOM
 	exit 1
 	;;
@@ -832,7 +831,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
@@ -849,12 +847,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 ..
@@ -884,60 +881,11 @@ $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
-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'
 BEGIN {
@@ -1001,12 +949,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
@@ -1025,11 +973,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
@@ -1055,7 +1003,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;;
@@ -1090,6 +1038,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;;
@@ -1099,26 +1058,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/'`
@@ -1128,13 +1067,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
@@ -1156,6 +1088,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..."
@@ -1177,12 +1255,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
@@ -1193,7 +1272,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 contact the author (doughera@lafcol.lafayette.edu).
 
 EOM
 		echo $n "Continue? [n] $c" >&4
@@ -1209,7 +1288,7 @@ EOM
 			;;
 		esac
 	else
-		echo "Looks good..." >&4
+		echo "Looks good..."
 	fi
 else
 	echo "There is no MANIFEST file.  I hope your kit is complete !"
@@ -1262,8 +1341,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
 		\\&*)
@@ -1281,18 +1372,6 @@ 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
@@ -1327,7 +1406,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
@@ -1336,8 +1415,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
@@ -1384,7 +1463,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
@@ -1394,7 +1473,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 me (doughera@lafcol.lafayette.edu) know how I blew it.
 
 This installation script affects things in two ways:
 
@@ -1465,6 +1544,7 @@ expr
 find
 grep
 ls
+make
 mkdir
 rm
 sed
@@ -1475,6 +1555,7 @@ uniq
 "
 trylist="
 Mcc
+ar
 byacc
 cpp
 csh
@@ -1496,7 +1577,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
@@ -1517,7 +1610,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
@@ -1681,10 +1786,10 @@ if test ! -f config.sh; then
 First time through, eh?  I have some defaults handy for the following systems:
 
 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 doughera@lafcol.lafayette.edu
 	: The metaconfig authors would also appreciate a copy...
 	$test -f /irix && osname=irix
 	$test -f /xenix && osname=sco_xenix
@@ -1700,12 +1805,12 @@ EOM
 	$test -f /etc/saf/_sactab && osname=svr4
 	$test -d /usr/include/minix && osname=minix
 	if $test -d /MachTen; then
-		osname=machten 
+		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"
@@ -1900,12 +2005,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
@@ -1932,17 +2037,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
@@ -1964,12 +2069,12 @@ If your OS version has no hints, DO NOT give a wrong version -- say "none".
 
 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 -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
@@ -1977,11 +2082,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
@@ -1993,13 +2098,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
 ;;
@@ -2072,18 +2175,60 @@ 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.
+(See README.threads for details.)
+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 
+
 : determine the architecture name
 echo " "
 if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then
@@ -2126,7 +2271,6 @@ $define)  echo "Threads selected." >&4
 *)        archname="$ans" ;;
 esac
 myarchname="$tarch"
-
 : is AFS running?
 echo " "
 case "$afs" in
@@ -2509,9 +2653,9 @@ 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`
+if $test -r $rsrc/patchlevel.h;then
+	patchlevel=`awk '/PATCHLEVEL/ {print $3}' $rsrc/patchlevel.h`
+	subversion=`awk '/SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
 else
 	patchlevel=0
 	subversion=0
@@ -2598,33 +2742,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'
-
-: bincompat3 is no more even possible starting with 5.005
-d_bincompat3=$undef
-
 : make some quick guesses about what we are up against
 echo " "
 $echo $n "Hmm...  $c"
@@ -2827,138 +2944,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
@@ -2991,6 +2976,39 @@ else
 	installbin="$binexp"
 fi
 
+
+: Binary compatibility with 5.003 is not possible with 5.004_50 and later.
+if test $patchlevel -ge 4 -o $subversion -ge 50; then
+    val=$undef
+else
+	$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
+fi
+set d_bincompat3
+eval $setvar
+case "$d_bincompat3" in
+"$define") bincompat3=y ;;
+*) bincompat3=n ;;
+esac
+
 : determine where manual pages are on this system
 echo " "
 case "$sysman" in
@@ -3021,7 +3039,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
@@ -3151,6 +3169,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 " "
@@ -3262,13 +3281,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"
@@ -3323,25 +3342,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
 '')
@@ -3364,6 +3364,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
@@ -3388,25 +3430,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 "*);;
@@ -3679,8 +3721,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".
 
@@ -3726,7 +3767,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
@@ -3748,7 +3789,6 @@ EOM
 esac
 
 : flags used in final linking phase
-
 case "$ldflags" in
 '') if ./venix; then
 		dflt='-i -z'
@@ -3802,7 +3842,7 @@ rmlist="$rmlist pdp11"
 
 : coherency check
 echo " "
-echo "Checking your choice of C compiler, libs, and flags for coherency..." >&4
+echo "Checking your choice of C compiler and flags for coherency..." >&4
 set X $cc $optimize $ccflags $ldflags -o try try.c $libs
 shift
 $cat >try.msg <<EOM
@@ -3816,20 +3856,37 @@ and I got the following output:
 EOM
 $cat > try.c <<'EOF'
 #include <stdio.h>
-main() { exit(0); }
+main() { printf("Ok\n"); 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 $ldflags -o try 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
@@ -3854,17 +3911,24 @@ n) echo "OK, that should do.";;
 esac
 $rm -f try try.* core
 
+: define a shorthand compile call
+compile='
+mc_file=$1;
+shift;
+$cc $optimize $ccflags $ldflags -o ${mc_file}$_exe $* ${mc_file}.c $libs > /dev/null 2>&1;'
+
 echo " "
 echo "Checking for GNU C Library..." >&4
 cat >gnulibc.c <<EOM
 int
 main()
 {
-  return __libc_main();
+	return __libc_main();
 }
 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 && \
+  ./gnulibc | $contains '^GNU C Library' >/dev/null 2>&1; then
 	val="$define"
 	echo "You are using the GNU C Library"
 else
@@ -3957,7 +4021,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
@@ -3975,15 +4039,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=''
@@ -4004,18 +4068,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 ' ' '\012' | 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
 	;;
@@ -4033,25 +4097,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."
@@ -4099,15 +4163,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
@@ -4183,16 +4244,16 @@ else
 			for thisname in $libnames; 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
 		else
 			echo "ar didn't seem to work right." >&4
 			echo "Maybe this is a Cray...trying bld instead..." >&4
-			if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list
+			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
+					$sed -e 's/.*\///' -e "s/\\$_o:.*\$//" >>libc.list
 					ar t $thisname >>libc.tmp
 				done
 				echo "Ok." >&4
@@ -4329,7 +4390,7 @@ yes)
 		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;
+		if $cc $optimize $ccflags $ldflags -o t t.c $libs >/dev/null 2>&1;
 		then tval=true;
 		else tval=false;
 		fi;
@@ -4443,18 +4504,25 @@ 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)
+				case "$ccflags" in
+					*-DDEBUGGING*)	dflt='-KPIC' ;;
+					*)	dflt='-Kpic' ;;
+				esac 
+				;;
 			sunos)	dflt='-pic' ;;
 			*)	dflt='none' ;;
-		    esac ;;
-		*)  case "$osname/$ccflags" in
-			solaris/*-DDEBUGGING*)	dflt='-fPIC' ;;
-			*)			dflt='-fpic' ;;
+		    esac
+			;;
+		*)  case "$osname" in
+			svr4*|esix*|solaris)
+				case "$ccflags" in
+					*-DDEBUGGING*)	dflt='-fPIC' ;;
+					*)	dflt='-fpic' ;;
+				esac 
+				;;
+			*)	dflt='-fpic' ;;
 		    esac ;;
 	    esac ;;
     *)	dflt="$cccdlflags" ;;
@@ -4623,7 +4691,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
@@ -4715,7 +4783,7 @@ EOM
 	echo "Ok, I'll use $libperl"
 	;;
 *)
-	libperl="libperl${lib_ext}"
+	libperl="libperl${_a}"
 	;;
 esac
 
@@ -4725,8 +4793,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 me (doughera@lafcol.lafayette.edu)
+know of any problems this may cause.
 
 EOM
 	case "$shrpdir" in
@@ -4822,14 +4890,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` ;;
@@ -4958,7 +5018,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";;
@@ -4969,7 +5028,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";;
@@ -4977,14 +5035,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
@@ -4995,7 +5049,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=''
@@ -5034,7 +5088,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 ;;
@@ -5101,6 +5155,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 " "
@@ -5196,15 +5259,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
 		}
@@ -5226,8 +5285,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`
@@ -5469,6 +5526,96 @@ else
 	installscript="$scriptdirexp"
 fi
 
+: determine where site specific libraries go.
+set sitelib sitelib
+eval $prefixit
+case "$sitelib" in
+'')
+	prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+	dflt="$privlib/site_$prog" ;;
+*)	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
+
 cat <<EOM
 
 Previous version of $package used the standard IO mechanisms as defined
@@ -5570,9 +5717,9 @@ esac
 
 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
@@ -5622,15 +5769,15 @@ main() {
 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
@@ -5682,10 +5829,10 @@ 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>
@@ -5744,10 +5891,10 @@ $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>
@@ -5777,7 +5924,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
@@ -5800,7 +5947,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
@@ -5818,28 +5964,22 @@ 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 && ./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)?"
@@ -5856,7 +5996,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 " "
@@ -5866,11 +6006,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
 	'')
@@ -5883,9 +6026,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
@@ -5924,7 +6070,8 @@ main()
 	exit(result);
 }
 EOCP
-if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+set try
+if eval $compile; then
 	./try
 	yyy=$?
 else
@@ -6005,7 +6152,8 @@ main()
 
 }
 EOCP
-if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+set try
+if eval $compile; then
 	./try
 	castflags=$?
 else
@@ -6044,7 +6192,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
@@ -6102,19 +6251,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
@@ -6130,8 +6279,8 @@ eval $setvar
 
 : get csh whereabouts
 case "$csh" in
-'csh')	val="$undef" ;;
-*)	val="$define" ;;
+'csh') val="$undef" ;;
+*) val="$define" ;;
 esac
 set d_csh
 eval $setvar
@@ -6343,8 +6492,8 @@ 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 && 
+		mv dyna${_o} tmp-dyna${_o} > /dev/null 2>&1 && 
+		$ld $lddlflags -o dyna.$dlext tmp-dyna${_o} > /dev/null 2>&1 && 
 		$cc $ccflags $ldflags $cccdlflags $ccdlflags fred.c -o fred $libs > /dev/null 2>&1; then
 		xxx=`./fred`
 		case $xxx in
@@ -6392,7 +6541,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
@@ -6403,7 +6552,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
@@ -6453,7 +6602,8 @@ main() {
 	exit(0);
 }
 EOCP
-	if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
+	set try
+	if eval $compile; then
 		o_nonblock=`./try`
 		case "$o_nonblock" in
 		'') echo "I can't figure it out, assuming O_NONBLOCK will do.";;
@@ -6531,7 +6681,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; then
 		echo "$startsh" >mtry
 		echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry
 		chmod +x mtry
@@ -6630,14 +6781,6 @@ 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 gethostent exists
 set gethostent d_gethent
 eval $inlibc
@@ -6646,14 +6789,6 @@ eval $inlibc
 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 getpgid exists
 set getpgid d_getpgid
 eval $inlibc
@@ -6670,22 +6805,6 @@ eval $inlibc
 set getpriority d_getprior
 eval $inlibc
 
-: see if getprotobyname exists
-set getprotobyname d_getpbyname
-eval $inlibc
-
-: see if getprotobynumber exists
-set getprotobynumber d_getpbynumber
-eval $inlibc
-
-: see if getservbyname exists
-set getservbyname d_getsbyname
-eval $inlibc
-
-: see if getservbyport exists
-set getservbyport d_getsbyport
-eval $inlibc
-
 : see if gettimeofday or ftime exists
 set gettimeofday d_gettimeod
 eval $inlibc
@@ -6815,7 +6934,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
@@ -6941,7 +7061,7 @@ case "$ans" in
 y*|true)
 	usemymalloc='y'
 	mallocsrc='malloc.c'
-	mallocobj='malloc.o'
+	mallocobj="malloc$_o"
 	d_mymalloc="$define"
 	case "$libs" in
 	*-lmalloc*)
@@ -7020,6 +7140,81 @@ eval $inlibc
 set poll d_poll
 eval $inlibc
 
+
+: see whether the various POSIXish _yields exist within given cccmd
+$cat >try.c <<EOP
+#include <pthread.h>
+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.*
+
+: test whether pthreads are created in joinable -- aka undetached -- state
+if test "X$usethreads" != X; then
+	echo >&4 "Checking whether pthreads are created joinable."
+	$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." ;;
+			*) echo "Yup, they are." ;;
+		esac
+	else
+		echo "(I can't execute the test program--assuming they are.)"
+		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
@@ -7142,15 +7337,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
@@ -7173,8 +7367,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--) {
@@ -7192,9 +7384,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; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7211,7 +7403,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* safebcpy core
+$rm -f try.* try core
 set d_safebcpy
 eval $setvar
 
@@ -7221,15 +7413,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
@@ -7271,9 +7462,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; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7290,7 +7481,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* safemcpy core
+$rm -f try.* try core
 set d_safemcpy
 eval $setvar
 
@@ -7299,16 +7490,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
@@ -7332,9 +7522,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; then
+		if ./try 2>/dev/null; then
 			echo "Yes, it can."
 			val="$define"
 		else
@@ -7345,7 +7535,7 @@ EOCP
 	fi
 	;;
 esac
-$rm -f foo.* sanemcmp core
+$rm -f try.* try core
 set d_sanemcmp
 eval $setvar
 
@@ -7558,12 +7748,7 @@ 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>
@@ -7572,21 +7757,21 @@ 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; then
 	:
 else
 	echo "But you don't seem to have a useable struct sigaction." >&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;
@@ -7599,8 +7784,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
@@ -7624,7 +7810,7 @@ EOM
 esac
 set d_sigsetjmp
 eval $setvar
-$rm -f set.c set
+$rm -f try.c try
 
 socketlib=''
 sockethdr=''
@@ -7647,10 +7833,10 @@ 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
+		echo "You don't have Berkeley networking in libc$_a..." >&4
+		if test -f /usr/lib/libnet$_a; then
+			( (nm $nm_opt /usr/lib/libnet$_a | eval $nm_extract) ||  \
+			ar t /usr/lib/libnet$_a) 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"
@@ -7663,7 +7849,7 @@ else
 					d_oldsock="$define"
 				fi
 			else
-				echo "or even in libnet$lib_ext, which is peculiar." >&4
+				echo "or even in libnet$_a, which is peculiar." >&4
 				d_socket="$undef"
 				d_oldsock="$undef"
 			fi
@@ -7757,7 +7943,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"
@@ -7787,7 +7974,6 @@ esac
 set d_stdio_cnt_lval
 eval $setvar
 
-
 : see if _base is also standard
 val="$undef"
 case "$d_stdstdio" in
@@ -7807,7 +7993,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"
@@ -8111,7 +8298,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; then
 		if ./closedir > /dev/null 2>&1 ; then
 			echo "Yes, it does."
 			val="$undef"
@@ -8199,7 +8387,8 @@ 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; then
 		dflt=`./try`
 	else
 		dflt='8'
@@ -8247,7 +8436,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)
@@ -8288,11 +8478,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
@@ -8310,6 +8500,51 @@ set db.h i_db
 eval $inhdr
 
 case "$i_db" in
+define)
+	: Check the return type needed for hash 
+	echo " "
+	echo "Checking return type needed for hash for Berkeley DB ..." >&4
+	$cat >try.c <<EOCP
+#$d_const HASCONST
+#ifndef HASCONST
+#define const
+#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()
+{
+	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
+			db_hashtype='int'
+		else
+			db_hashtype='u_int32_t'
+		fi
+	else
+		: XXX Maybe we should just give up here.
+		db_hashtype=u_int32_t
+		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
+	$rm -f try.*
+	echo "Your version of Berkeley DB uses $db_hashtype for hash."
+	;;
+*)	db_hashtype=u_int32_t
+	;;
+esac
+
+case "$i_db" in
 $define)
 	: Check db version.
 	echo " "
@@ -8358,7 +8593,8 @@ main()
 #endif
 }
 EOCP
-	if $cc $optimize $ccflags $ldflags -o try try.c $libs && ./try; then
+	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
@@ -8380,51 +8616,6 @@ esac
 
 case "$i_db" in
 define)
-	: Check the return type needed for hash 
-	echo " "
-	echo "Checking return type needed for hash for Berkeley DB ..." >&4
-	$cat >try.c <<EOCP
-#$d_const HASCONST
-#ifndef HASCONST
-#define const
-#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()
-{
-	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
-			db_hashtype='int'
-		else
-			db_hashtype='u_int32_t'
-		fi
-	else
-		: XXX Maybe we should just give up here.
-		db_hashtype=u_int32_t
-		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
-	$rm -f try.*
-	echo "Your version of Berkeley DB uses $db_hashtype for hash."
-	;;
-*)	db_hashtype=u_int32_t
-	;;
-esac
-
-case "$i_db" in
-define)
 	: Check the return type needed for prefix 
 	echo " "
 	echo "Checking return type needed for prefix for Berkeley DB ..." >&4
@@ -8552,7 +8743,6 @@ 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") ;;
 *)
@@ -8603,6 +8793,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
@@ -8633,39 +8824,23 @@ rp="What type is lseek's offset on this system declared as?"
 lseektype="$ans"
 
 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
@@ -8677,6 +8852,217 @@ rp="What type is used for file modes?"
 . ./myread
 modetype="$ans"
 
+: Cruising for prototypes
+echo " "
+echo "Checking out function prototypes..." >&4
+$cat >prototype.c <<'EOCP'
+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*
+
+: 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 if gethostbyaddr exists
+set gethostbyaddr d_gethbyaddr
+eval $inlibc
+
+: see if gethostbyname exists
+set gethostbyname d_gethbyname
+eval $inlibc
+
+: see if getnetbyaddr exists
+set getnetbyaddr d_getnbyaddr
+eval $inlibc
+
+: see if this is a netdb.h system
+set netdb.h i_netdb
+eval $inhdr
+
+: 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"
+
+: 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_name_type='long'
+		;;
+	esac
+fi
 : locate the preferred pager for this system
 case "$pager" in
 '')
@@ -8702,23 +9088,14 @@ rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"
 
-: Cruising for prototypes
+: see what type pids are declared as in the kernel
+set pid_t pidtype int stdio.h sys/types.h
+eval $typedef
+dflt="$pidtype"
 echo " "
-echo "Checking out function prototypes..." >&4
-$cat >prototype.c <<'EOCP'
-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*
+rp="What type are process ids on this system declared as?"
+. ./myread
+pidtype="$ans"
 
 : check for size of random number generator
 echo " "
@@ -8750,11 +9127,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; then
+		dflt=`./try$_exe`
 	else
 		dflt='?'
 		echo "(I can't seem to compile the test program...)"
@@ -8767,7 +9144,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 " "
@@ -8780,18 +9157,18 @@ 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."
 	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'."
 		orderlib=false
-		ranlib="ar ts"
+		ranlib="$ar ts"
 else
 	case "$ranlib" in
 	:) ranlib='';;
@@ -8861,10 +9238,9 @@ 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 " "
@@ -8932,7 +9308,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
@@ -8949,7 +9326,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
@@ -8971,73 +9349,50 @@ 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=''
+		for xxx in 'fd_set *' 'int *'; do
+			for nfd in 'int' 'size_t' 'unsigned' ; 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
-
-	$cat <<EOM
-
-Checking to see what type of arguments are expected by select().
-EOM
-	$cat >try.c <<EOCP
-#$i_systime I_SYS_TIME
-#$i_sysselct I_SYS_SELECT
-#$d_socket HAS_SOCKET
-#include <sys/types.h>
-#ifdef HAS_SOCKET
-#include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
-#endif
-#ifdef I_SYS_TIME
-#include <sys/time.h>
-#endif
-#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);
-}
-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 *'
 	;;
 esac
 
@@ -9175,8 +9530,8 @@ 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 $cc $optimize $ccflags $ldflags -o signal signal.c $libs >/dev/null 2>&1; 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 'kill -l' >signal
@@ -9189,27 +9544,25 @@ else
 	echo \$@ | $tr ' ' '\012' | \
 		$awk '{ printf \$1; printf " %d\n", ++s; }' >signal.lst
 fi
-$rm -f signal.c signal signal.o
+$rm -f signal.c signal signal$_o
 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='' ;;
-esac
-case "$sig_name" in
+case "$sig_name_init" in
 '')
 	echo "Generating a list of signal names and numbers..." >&4
 	./signal_cmd
 	sig_name=`$awk '{printf "%s ", $1}' signal.lst`
 	sig_name="ZERO $sig_name"
-	sig_num=`$awk '{printf "%d ", $2}' signal.lst`
-	sig_num="0 $sig_num"
+	sig_name_init=`$awk 'BEGIN { printf "\"ZERO\", " }
+						{ printf "\"%s\", ", $1 }
+						END { printf "0\n" }' signal.lst`
+	sig_num=`$awk 'BEGIN { printf "0, " }
+					{ printf "%d, ", $2}
+					END { printf "0\n"}' signal.lst`
 	;;
 esac
 echo "The following signals are available:"
@@ -9230,15 +9583,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
@@ -9256,23 +9600,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 && ./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.)
@@ -9285,216 +9622,7 @@ EOM
 	. ./myread
 	ssizetype="$ans"
 fi
-$rm -f ssize ssize.[co] ssize.out
-
-: see if this is a netdb.h system
-set netdb.h i_netdb
-eval $inhdr
-
-: check for type of arguments to gethostbyaddr.  This will only really
-: work if the system supports prototypes and provides one for
-: gethostbyaddr.  The netdb_host_type and netdb_hlen_type get defined.
-case "$d_gethbyaddr" in
-$define)
-        if test "X$netdb_host_type" = X -o "X$netdb_hlen_type" = X; then
-	    $cat <<EOM
-
-Checking to see what type of arguments are expected by gethostbyaddr().
-EOM
-	$cat >try.c <<EOCP
-#include <sys/types.h>
-#$i_niin I_NIIN
-#$i_netdb I_NETDB
-#$i_unistd I_UNISTD
-#$d_socket HAS_SOCKET
-#$d_socket HAS_SOCKET
-#ifdef HAS_SOCKET
-#include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
-#endif
-#ifdef I_NIIN
-#include <netinet/in.h>
-#endif
-#ifdef I_NETDB
-#include <netdb.h>
-#endif
-#ifdef I_UNISTD
-#include <unistd.h>
-#endif
-#define Size_t $sizetype
-main()
-{
-        Netdb_alen_t	alen = sizeof(struct in_addr);
-	Netdb_addr_t	addr = (Netdb_addr_t)malloc(alen);
-	struct hostent*	hent;
-
-	extern struct hostent *gethostbyaddr(Netdb_addr_t, Netdb_alen_t, int);
-
-	/* We do not execute this so the arguments matter not. */
-	hent = gethostbyaddr(addr, alen, AF_INET);
-
-	exit(0);
-}
-EOCP
-	    for xxx in in_addr_t "const void *" "const char *" "void *" "char *"; do
-		    for yyy in Size_t long int; do
-			    if $cc $ccflags -c -DNetdb_addr_t="$xxx" -DNetdb_alen_t="$yyy" try.c >/dev/null 2>&1 ; then
-				netdb_host_type="$xxx"
-				netdb_hlen_type="$yyy"
-				$cat >&4 <<EOM
-Your system accepts $xxx for the 1st argument to gethostbyaddr.
-and the 2nd argument to gethostbyaddr can be $yyy.
-EOM
-				break
-			    fi
-		    done
-		    test "X$netdb_host_type" != X && break
-	    done
-	    if test "X$netdb_host_type" = X; then
-		    rp='What is the type for the 1st argument to gethostbyaddr?'
-		    dflt="void *"
-		    . ./myread
-		    netdb_host_type="$ans"
-
-		    # Remove the "const" if needed.
-		    netdb_host_type=`echo "$netdb_host_type" | sed 's/^const //'`
-
-		    rp='What is the type for the 2nd argument to gethostbyaddr ?'
-		    dflt="Size_t"
-		    . ./myread
-		    netdb_hlen_type="$ans"
-	    fi
-	    $rm -f try.[co]
-	 else
-	    $cat >&4 <<EOM
-Your system accepts $netdb_host_type for the 1st argument to gethostbyaddr.
-and the 2nd argument to gethostbyaddr can be $netdb_hlen_type.
-EOM
-	fi
-	;;
-*)	netdb_host_type='void *'
-	netdb_hlen_type='Size_t'
-	;;
-esac
-
-: check for type of arguments to gethostbyname.  This will only really
-: work if the system supports prototypes and provides one for
-: gethostbyname.  The netdb_name_type gets defined.
-case "$d_gethbyname" in
-$define)
-        if test "X$netdb_name_type" = X; then
-            $cat <<EOM
-
-Checking to see what type of arguments are expected by gethostbyname().
-EOM
-        $cat >try.c <<EOCP
-#$i_niin I_NIIN
-#$i_netdb I_NETDB
-#$d_socket HAS_SOCKET
-#$d_socket HAS_SOCKET
-#include <sys/types.h>
-#ifdef HAS_SOCKET
-#include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
-#endif
-#ifdef I_NIIN
-#include <netinet/in.h>
-#endif
-#ifdef I_NETDB
-#include <netdb.h>
-#endif
-main()
-{
-        char*  host = "localhost";
-        struct hostent*  hent;
-
-        extern struct hostent *gethostbyname(Netdb_name_t);
-
-        /* We do not execute this so the arguments matter not. */
-        hent = gethostbyname(host);
-
-        exit(0);
-}
-EOCP
-            for xxx in "const char *" "char *"; do
-                    if $cc $ccflags -c -DNetdb_name_t="$xxx" try.c >/dev/null 2>&1 ; then
-                        netdb_name_type="$xxx"
-                        echo "Your system accepts $xxx for the 1st argument to gethostbyname." >&4
-                        break
-                    fi
-            done
-            if test "X$netdb_name_type" = X; then
-                    rp='What is the type for the 1st argument to gethostbyname?'
-                    dflt="char *"
-                    . ./myread
-                    netdb_name_type="$ans"
-            fi
-            $rm -f try.[co]
-        else
-            echo "Your system accepts $netdb_name_type for the 1st argument to gethostbyname." >&4
-        fi
-        ;;
-*)      netdb_name_type='char *'
-        ;;
-esac
-
-: check for type of arguments to getnetbyaddr.  This will only really
-: work if the system supports prototypes and provides one for
-: getnetbyaddr.  The netdb_net_type gets defined.
-case "$d_getnbyaddr" in
-$define)
-        if test "X$netdb_net_type" = X; then
-            $cat <<EOM
-
-Checking to see what type of arguments are expected by getnetbyaddr().
-EOM
-        $cat >try.c <<EOCP
-#$i_niin I_NIIN
-#$i_netdb I_NETDB
-#$d_socket HAS_SOCKET
-#$d_socket HAS_SOCKET
-#include <sys/types.h>
-#ifdef HAS_SOCKET
-#include <sys/socket.h> /* Might include <sys/bsdtypes.h> */
-#endif
-#ifdef I_NIIN
-#include <netinet/in.h>
-#endif
-#ifdef I_NETDB
-#include <netdb.h>
-#endif
-main()
-{
-        Netdb_net_t  net;
-        struct netent*  nent;
-
-        extern struct netent *getnetbyaddr(Netdb_net_t, int);
-
-        /* We do not execute this so the arguments matter not. */
-        nent = getnetbyaddr(net, 2);
-
-        exit(0);
-}
-EOCP
-            for xxx in in_addr_t "unsigned long" long "unsigned int" int; do
-                    if $cc $ccflags -c -DNetdb_net_t="$xxx" try.c >/dev/null 2>&1 ; then
-                        netdb_net_type="$xxx"
-                        echo "Your system accepts $xxx for the 1st argument to getnetbyaddr." >&4
-                        break
-                    fi
-            done
-            if test "X$netdb_net_type" = X; then
-                    rp='What is the type for the 1st argument to getnetbyaddr?'
-                    dflt="long"
-                    . ./myread
-                    netdb_net_type="$ans"
-            fi
-            $rm -f try.[co]
-        else
-            echo "Your system accepts $netdb_net_type for the 1st argument to getnetbyaddr." >&4
-        fi
-        ;;
-*)      netdb_net_type='long'
-        ;;
-esac
+$rm -f ssize ssize.*
 
 : see what type of char stdio uses.
 echo " "
@@ -9905,7 +10033,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
 
@@ -10037,89 +10165,6 @@ val="$t_gdbm"
 set i_gdbm
 eval $setvar
 
-: test whether pthreads are created in joinable -- aka undetached -- state
-if test "X$usethreads" != X; then
-    if test "X$d_pthreads_created_joinable" = X; then
-	echo >&4 "Checking whether pthreads are created joinable."
-	$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
-	if $cc $ccflags $ldflags -o try try.c $libs >/dev/null 2>&1; then
-	    yyy=`./try`
-	    case "$yyy" in
-	    detached)
-	        echo "Nope, they aren't."
-	        ;;
-	    *)
-	        echo "Yup, they are."
-	        ;;
-	    esac
-	else
-	    echo "(I can't execute the test program--assuming they are.)"
-	    yyy=joinable
-	fi
-	case "$yyy" in
-	detached)
-	    val="$undef"
-	    ;;
-	*)
-	    val="$define"
-	    ;;
-	esac
-	set d_pthreads_created_joinable
-	eval $setvar
-	$rm -f try try.*
-    fi
-else
-    d_pthreads_created_joinable="$undef"
-fi
-
-: see whether the various POSIXish _yields exist within given cccmd
-$cat >try.c <<EOP
-#include <pthread.h>
-main() {
-	YIELD();
-	exit(0);
-}
-EOP
-: see if pthread_yield exists within given cccmd,
-: if we do not usethreads this may well end up undef.
-if $cc $ccflags -DYIELD=pthread_yield $ldflags -o try try.c $libs > /dev/null 2>&1; 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.
-if $cc $ccflags -DYIELD=sched_yield $ldflags -o try try.c $libs > /dev/null 2>&1; then
-    val="$define"
-    echo 'sched_yield() found.' >&4
-else
-    val="$undef"
-    echo 'sched_yield() NOT found.' >&4
-fi
-set d_sched_yield
-eval $setvar
-
-: common to both the pthread_yield and sched_yield tests
-rm -f try try.*
-
 echo " "
 echo "Looking for extensions..." >&4
 cd ../ext
@@ -10182,11 +10227,11 @@ for xxx in $known_extensions ; do
 	    esac
 	    ;;
     Socket|socket) case "$d_socket" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
+	    true|$define|y) avail_ext="$avail_ext $xxx" ;;
 	    esac
 	    ;;
     Thread|thread) case "$usethreads" in 
-	    $define) avail_ext="$avail_ext $xxx" ;;
+	    true|$define|y) avail_ext="$avail_ext $xxx" ;;
 	    esac
 	    ;;
     *)      avail_ext="$avail_ext $xxx"
@@ -10330,15 +10375,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'
@@ -10351,6 +10398,9 @@ RCSfile='$RCSfile'
 Revision='$Revision'
 Source='$Source'
 State='$State'
+_a='$_a'
+_exe='$_exe'
+_o='$_o'
 afs='$afs'
 alignbytes='$alignbytes'
 aphostname='$aphostname'
@@ -10406,7 +10456,6 @@ 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'
@@ -10444,27 +10493,17 @@ d_fpathconf='$d_fpathconf'
 d_fsetpos='$d_fsetpos'
 d_ftime='$d_ftime'
 d_getgrps='$d_getgrps'
-d_setgrps='$d_setgrps'
 d_gethbyaddr='$d_gethbyaddr'
-netdb_host_type='$netdb_host_type'
-netdb_hlen_type='$netdb_hlen_type'
 d_gethbyname='$d_gethbyname'
-netdb_name_type='$netdb_name_type'
 d_gethent='$d_gethent'
 d_gethname='$d_gethname'
 d_getlogin='$d_getlogin'
 d_getnbyaddr='$d_getnbyaddr'
-d_getnbyname='$d_getnbyname'
-netdb_net_type='$netdb_net_type'
 d_getpgid='$d_getpgid'
 d_getpgrp2='$d_getpgrp2'
 d_getpgrp='$d_getpgrp'
 d_getppid='$d_getppid'
 d_getprior='$d_getprior'
-d_getpbyname='$d_getpbyname'
-d_getpbynumber='$d_getpbynumber'
-d_getsbyname='$d_getsbyname'
-d_getsbyport='$d_getsbyport'
 d_gettimeod='$d_gettimeod'
 d_gnulibc='$d_gnulibc'
 d_htonl='$d_htonl'
@@ -10493,7 +10532,6 @@ d_msgrcv='$d_msgrcv'
 d_msgsnd='$d_msgsnd'
 d_mymalloc='$d_mymalloc'
 d_nice='$d_nice'
-d_oldarchlib='$d_oldarchlib'
 d_oldsock='$d_oldsock'
 d_open3='$d_open3'
 d_pathconf='$d_pathconf'
@@ -10527,6 +10565,7 @@ d_semget='$d_semget'
 d_semop='$d_semop'
 d_setegid='$d_setegid'
 d_seteuid='$d_seteuid'
+d_setgrps='$d_setgrps'
 d_setlinebuf='$d_setlinebuf'
 d_setlocale='$d_setlocale'
 d_setpgid='$d_setpgid'
@@ -10743,13 +10782,15 @@ 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_opt='$nm_opt'
 nm_so_opt='$nm_so_opt'
 nroff='$nroff'
 o_nonblock='$o_nonblock'
 obj_ext='$obj_ext'
-oldarchlib='$oldarchlib'
-oldarchlibexp='$oldarchlibexp'
 optimize='$optimize'
 orderlib='$orderlib'
 osname='$osname'
@@ -10764,6 +10805,7 @@ perladmin='$perladmin'
 perlpath='$perlpath'
 pg='$pg'
 phostname='$phostname'
+pidtype='$pidtype'
 plibpth='$plibpth'
 pmake='$pmake'
 pr='$pr'
@@ -10791,6 +10833,7 @@ shortsize='$shortsize'
 shrpenv='$shrpenv'
 shsharp='$shsharp'
 sig_name='$sig_name'
+sig_name_init='$sig_name_init'
 sig_num='$sig_num'
 signal_t='$signal_t'
 sitearch='$sitearch'
@@ -10808,6 +10851,7 @@ sort='$sort'
 spackage='$spackage'
 spitshell='$spitshell'
 split='$split'
+src='$src'
 ssizetype='$ssizetype'
 startperl='$startperl'
 startsh='$startsh'
@@ -10816,6 +10860,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'
@@ -10841,6 +10886,7 @@ useperlio='$useperlio'
 useposix='$useposix'
 usesfio='$usesfio'
 useshrplib='$useshrplib'
+usethreads='$usethreads'
 usevfork='$usevfork'
 usrinc='$usrinc'
 uuname='$uuname'
@@ -10852,8 +10898,8 @@ zip='$zip'
 EOT
 
 : 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
diff --git a/INSTALL b/INSTALL
index 4814d84bf9..782cd9483d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -363,17 +363,12 @@ above.
 
 The  directories site_perl and site_perl/archname are empty, but are
 intended to be used for installing local or site-wide extensions.  Perl
-will automatically look in these directories.  Previously, most sites
-just put their local extensions in with the standard distribution.
+will automatically look in these directories. 
 
 In order to support using things like #!/usr/local/bin/perl5.004 after
 a later version is released, architecture-dependent libraries are
 stored in a version-specific directory, such as
-/usr/local/lib/perl5/archname/5.004/.  In Perl 5.000 and 5.001, these
-files were just stored in /usr/local/lib/perl5/archname/.  If you will
-not be using 5.001 binaries, you can delete the standard extensions from
-the /usr/local/lib/perl5/archname/ directory.  Locally-added extensions
-can be moved to the site_perl and site_perl/archname directories.
+/usr/local/lib/perl5/archname/5.004/.  
 
 Again, these are just the defaults, and can be changed as you run
 Configure.
@@ -866,8 +861,8 @@ and then re-run
 
 =item No sh
 
-If you don't have sh, you'll have to copy the sample file config_H to
-config.h and edit the config.h to reflect your system's peculiarities.
+If you don't have sh, you'll have to copy the sample file Porting/config_H
+to config.h and edit the config.h to reflect your system's peculiarities.
 You'll probably also have to extensively modify the extension building
 mechanism.
 
diff --git a/MANIFEST b/MANIFEST
index a0e0dd5a63..71532764a7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -13,6 +13,8 @@ INTERN.h		Included before domestic .h files
 MANIFEST		This list of files
 Makefile.SH		A script that generates Makefile
 Porting/Glossary	Glossary of config.sh variables
+Porting/config_H	Sample config.h
+Porting/config.sh	Sample config.sh
 Porting/makerel		Release making utility
 Porting/patchls		Flexible patch file listing utility
 Porting/pumpkin.pod	Guidelines and hints for Perl maintainers
@@ -38,7 +40,6 @@ byterun.h		Header for byterun.c
 cc_runtime.h		Macros need by runtime of compiler-generated code
 cflags.SH		A script that emits C compilation flags per file
 compat3.sym		List of symbols for binary-compatibility with 5.003
-config_H		Sample config.h
 config_h.SH		Produces config.h
 configpm		Produces lib/Config.pm
 cop.h			Control operator header
diff --git a/Makefile.SH b/Makefile.SH
index 4280570916..584353c5fa 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -139,13 +139,12 @@ shellflags = $shellflags
 # do it for you.
 $make_set_make
 
-# These variables will be used in a future version to make
-# the make file more portable to non-unix systems.
+# These variables may need to be manually set for non-Unix systems.
 AR = $ar
-EXE_EXT = $exe_ext
-LIB_EXT = $lib_ext
-OBJ_EXT = $obj_ext
-PATH_SEP = $path_sep
+EXE_EXT = $_exe
+LIB_EXT = $_a
+OBJ_EXT = $_o
+PATH_SEP = $p_
 
 FIRSTMAKEFILE = $firstmakefile
 
diff --git a/Porting/Glossary b/Porting/Glossary
index c71c199ec4..88c12cd48a 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -2,13 +2,34 @@ This file contains a description of all the shell variables whose value is
 determined by the Configure script.  Variables intended for use in C
 programs (e.g. I_UNISTD) are already described in config_h.SH.
 
+_a (Unix.U):
+	This variable defines the extension used for ordinary libraries.
+	For unix, it is '.a'.  The '.' is included.  Other possible
+	values include '.lib'.
+
+_exe (Unix.U):
+	This variable defines the extension used for executable files.
+	For unix it is empty.  Other possible values include '.exe'.
+
+_o (Unix.U):
+	This variable defines the extension used for object files.
+	For unix, it is '.o'.  The '.' is included.  Other possible
+	values include '.obj'.
+
+afs (afs.U):
+	This variable is set to 'true' if AFS (Andrew File System) is used
+	on the system, 'false' otherwise.  It is possible to override this
+	with a hint value or command line option, but you'd better know
+	what you are doing.
+
 alignbytes (alignbytes.U):
 	This variable holds the number of bytes required to align a
 	double. Usual values are 2, 4 and 8.
 
-ar (Unix.U):
-	This variable defines the command to use to create an archive 
-	library.  For unix, it is 'ar'.
+aphostname (d_gethname.U):
+	Thie variable contains the command which can be used to compute the
+	host name. The command is fully qualified by its absolute path, to make
+	it safe when used by a process with super-user privileges.
 
 archlib (archlib.U):
 	This variable holds the name of the directory in which the user wants
@@ -21,6 +42,10 @@ archlibexp (archlib.U):
 	This variable is the same as the archlib variable, but is
 	filename expanded at configuration time, for convenient use.
 
+archname (archname.U):
+	This variable is a short name to characterize the current
+	architecture.  It is used mainly to construct the default archlib.
+
 archobjs (Unix.U):
 	This variable defines any additional objects that must be linked
 	in with the program on this architecture.  On unix, it is usually
@@ -28,6 +53,9 @@ archobjs (Unix.U):
 	or other facilities.  For perl on OS/2, for example, this would
 	include os2/os2.obj.
 
+baserev (baserev.U):
+	The base revision level of this package, from the .package file.
+
 bin (bin.U):
 	This variable holds the name of the directory in which the user wants
 	to put publicly executable images for the package in question.  It
@@ -38,6 +66,10 @@ bincompat3 (bincompat3.U):
 	This variable contains y if Perl 5.004 should be binary-compatible
 	with Perl 5.003.
 
+binexp (bin.U):
+	This is the same as the bin variable, but is filename expanded at
+	configuration time, for use in your makefiles.
+
 byteorder (byteorder.U):
 	This variable holds the byte order. In the following, larger digits
 	indicate more significance.  The variable byteorder is either 4321
@@ -82,10 +114,25 @@ cf_by (cf_who.U):
 	Login name of the person who ran the Configure script and answered the
 	questions. This is used to tag both config.sh and config_h.SH.
 
+cf_email (cf_email.U):
+	Electronic mail address of the person who ran Configure. This can be
+	used by units that require the user's e-mail, like MailList.U.
+
 cf_time (cf_who.U):
 	Holds the output of the "date" command when the configuration file was
 	produced. This is used to tag both config.sh and config_h.SH.
 
+clocktype (d_times.U):
+	This variable holds the type returned by times(). It can be long,
+	or clock_t on BSD sites (in which case <sys/types.h> should be
+	included).
+
+contains (contains.U):
+	This variable holds the command to do a grep with a proper return
+	status.  On most sane systems it is simply "grep".  On insane systems
+	it is a grep followed by a cat followed by a test.  This variable
+	is primarily for the use of other Configure units.
+
 cpp_stuff (cpp_stuff.U):
 	This variable contains an identification of the catenation mechanism
 	used by the C preprocessor.
@@ -94,12 +141,24 @@ cppflags (ccflags.U):
 	This variable holds the flags that will be passed to the C pre-
 	processor. It is up to the Makefile to use it.
 
+cpplast (cppstdin.U):
+	This variable has the same functionality as cppminus, only it applies to
+	cpprun and not cppstdin.
+
 cppminus (cppstdin.U):
 	This variable contains the second part of the string which will invoke
 	the C preprocessor on the standard input and produce to standard
 	output.  This variable will have the value "-" if cppstdin needs a minus
 	to specify standard input, otherwise the value is "".
 
+cpprun (cppstdin.U):
+	This variable contains the command which will invoke a C preprocessor
+	on standard input and put the output to stdout. It is guaranteed not
+	to be a wrapper and may be a null string if no preprocessor can be
+	made directly available. This preprocessor might be different from the
+	one used by the C compiler. Don't forget to append cpplast after the
+	preprocessor options.
+
 cppstdin (cppstdin.U):
 	This variable contains the command which will invoke the C
 	preprocessor on standard input and put the output to stdout.
@@ -140,22 +199,17 @@ d_bcopy (d_bcopy.U):
 d_bincompat3 (bincompat3.U):
 	This variable conditionally defines BINCOMPAT3 so that embed.h
 	can take special action if Perl 5.004 should be binary-compatible
-	with Perl 5.003.
+	with Perl 5.003.  This is impossible for 5.004_50 and later, so
+	it is always $undef for those versions.
+
+d_bsd (Guess.U):
+	This symbol conditionally defines the symbol BSD when running on a
+	BSD system.
 
 d_bsdgetpgrp (d_getpgrp.U):
 	This variable conditionally defines USE_BSD_GETPGRP if
 	getpgrp needs one arguments whereas USG one needs none.
 
-d_bsdpgrp (d_setpgrp.U):
-	This variable conditionally defines USE_BSDPGRP if the notion of
-	process group is the BSD one. This means setpgrp needs two arguments
-	whereas USG one needs none.
-
-d_bsdsetpgrp (d_setpgrp.U):
-	This variable conditionally defines USE_BSD_SETPGRP if
-	setpgrp needs two arguments whereas USG one needs none.
-	See also d_setpgid for a POSIX interface.
-
 d_bzero (d_bzero.U):
 	This variable conditionally defines the HAS_BZERO symbol if
 	the bzero() routine is available to set memory to 0.
@@ -186,6 +240,10 @@ d_chsize (d_chsize.U):
 	indicates to the C program that the chsize() routine is available
 	to truncate files.  You might need a -lx to get this routine.
 
+d_closedir (d_closedir.U):
+	This variable conditionally defines HAS_CLOSEDIR if closedir() is
+	available.
+
 d_const (d_const.U):
 	This variable conditionally defines the HASCONST symbol, which
 	indicates to the C program that this C compiler knows about the
@@ -223,6 +281,10 @@ d_dlerror (d_dlerror.U):
 	This variable conditionally defines the HAS_DLERROR symbol, which
 	indicates to the C program that the dlerror() routine is available.
 
+d_dlopen (d_dlopen.U):
+	This variable conditionally defines the HAS_DLOPEN symbol, which
+	indicates to the C program that the dlopen() routine is available.
+
 d_dlsymun (d_dlsymun.U):
 	This variable conditionally defines DLSYM_NEEDS_UNDERSCORE, which
 	indicates that we need to prepend an underscore to the symbol
@@ -241,6 +303,10 @@ d_eofnblk (nblock_io.U):
 	This variable conditionally defines EOF_NONBLOCK if EOF can be seen
 	when reading from a non-blocking I/O source.
 
+d_eunice (Guess.U):
+	This variable conditionally defines the symbols EUNICE and VAX, which
+	alerts the C program that it must deal with ideosyncracies of VMS.
+
 d_fchmod (d_fchmod.U):
 	This variable conditionally defines the HAS_FCHMOD symbol, which
 	indicates to the C program that the fchmod() routine is available
@@ -255,6 +321,22 @@ d_fcntl (d_fcntl.U):
 	This variable conditionally defines the HAS_FCNTL symbol, and indicates
 	whether the fcntl() function exists
 
+d_fd_macros (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FD_MACROS symbol,
+	which indicates if your C compiler knows about the macros which
+	manipulate an fd_set.
+
+d_fd_set (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FD_SET symbol,
+	which indicates if your C compiler knows about the fd_set typedef.
+
+d_fds_bits (d_fd_set.U):
+	This variable contains the eventual value of the HAS_FDS_BITS symbol,
+	which indicates if your fd_set typedef contains the fds_bits member.
+	If you have an fd_set typedef, but the dweebs who installed it did
+	a half-fast job and neglected to provide the macros to manipulate
+	an fd_set, HAS_FDS_BITS will let us know how to fix the gaffe.
+
 d_fgetpos (d_fgetpos.U):
 	This variable conditionally defines HAS_FGETPOS if fgetpos() is
 	available to get the file position indicator.
@@ -282,38 +364,53 @@ d_fsetpos (d_fsetpos.U):
 	available to set the file position indicator.
 
 d_ftime (d_ftime.U):
-	This variable conditionally defines the HAS_FTIME symbol, which
-	indicates that the ftime() routine exists.  The ftime() routine is
-	basically a sub-second accuracy clock.
+	This variable conditionally defines the HAS_FTIME symbol, which indicates
+	that the ftime() routine exists.  The ftime() routine is basically
+	a sub-second accuracy clock.
+
+d_getgrps (d_getgrps.U):
+	This variable conditionally defines the HAS_GETGROUPS symbol, which
+	indicates to the C program that the getgroups() routine is available
+	to get the list of process groups.
+
+d_gethbyaddr (d_gethbyad.U):
+	This variable conditionally defines the HAS_GETHOSTBYADDR symbol, which
+	indicates to the C program that the gethostbyaddr() routine is available
+	to look up hosts by their IP addresses.
 
 d_gethent (d_gethent.U):
 	This variable conditionally defines HAS_GETHOSTENT if gethostent() is
 	available to dup file descriptors.
 
-d_gettimeod (d_ftime.U):
-	This variable conditionally defines the HAS_GETTIMEOFDAY symbol, which
-	indicates that the gettimeofday() system call exists (to obtain a
-	sub-second accuracy clock).
+d_gethname (d_gethname.U):
+	This variable conditionally defines the HAS_GETHOSTNAME symbol, which
+	indicates to the C program that the gethostname() routine may be
+	used to derive the host name.
 
 d_getlogin (d_getlogin.U):
 	This variable conditionally defines the HAS_GETLOGIN symbol, which
 	indicates to the C program that the getlogin() routine is available
 	to get the login name.
 
+d_getnbyaddr (d_getnbyad.U):
+	This variable conditionally defines the HAS_GETNETBYADDR symbol, which
+	indicates to the C program that the getnetbyaddr() routine is available
+	to look up networks by their IP addresses.
+
 d_getpgid (d_getpgid.U):
 	This variable conditionally defines the HAS_GETPGID symbol, which
 	indicates to the C program that the getpgid(pid) function
 	is available to get the process group id.
 
-d_getpgrp (d_getpgrp.U):
-	This variable conditionally defines HAS_GETPGRP if getpgrp() is
-	available to get the current process group.
-
 d_getpgrp2 (d_getpgrp2.U):
 	This variable conditionally defines the HAS_GETPGRP2 symbol, which
 	indicates to the C program that the getpgrp2() (as in DG/UX) routine
 	is available to get the current process group.
 
+d_getpgrp (d_getpgrp.U):
+	This variable conditionally defines HAS_GETPGRP if getpgrp() is
+	available to get the current process group.
+
 d_getppid (d_getppid.U):
 	This variable conditionally defines the HAS_GETPPID symbol, which
 	indicates to the C program that the getppid() routine is available
@@ -323,6 +420,14 @@ d_getprior (d_getprior.U):
 	This variable conditionally defines HAS_GETPRIORITY if getpriority()
 	is available to get a process's priority.
 
+d_gettimeod (d_ftime.U):
+	This variable conditionally defines the HAS_GETTIMEOFDAY symbol, which
+	indicates that the gettimeofday() system call exists (to obtain a
+	sub-second accuracy clock). You should probably include <sys/resource.h>.
+
+d_gnulibc (d_gnulibc.U):
+	Defined if we're dealing with the GNU C Library.
+
 d_htonl (d_htonl.U):
 	This variable conditionally defines HAS_HTONL if htonl() and its
 	friends are available to do network order byte swapping.
@@ -413,6 +518,22 @@ d_msg (d_msg.U):
 	This variable conditionally defines the HAS_MSG symbol, which
 	indicates that the entire msg*(2) library is present.
 
+d_msgctl (d_msgctl.U):
+	This variable conditionally defines the HAS_MSGCTL symbol, which
+	indicates to the C program that the msgctl() routine is available.
+
+d_msgget (d_msgget.U):
+	This variable conditionally defines the HAS_MSGGET symbol, which
+	indicates to the C program that the msgget() routine is available.
+
+d_msgrcv (d_msgrcv.U):
+	This variable conditionally defines the HAS_MSGRCV symbol, which
+	indicates to the C program that the msgrcv() routine is available.
+
+d_msgsnd (d_msgsnd.U):
+	This variable conditionally defines the HAS_MSGSND symbol, which
+	indicates to the C program that the msgsnd() routine is available.
+
 d_mymalloc (mallocsrc.U):
 	This variable conditionally defines MYMALLOC in case other parts
 	of the source want to take special action if MYMALLOC is used.
@@ -422,10 +543,9 @@ d_nice (d_nice.U):
 	This variable conditionally defines the HAS_NICE symbol, which
 	indicates to the C program that the nice() routine is available.
 
-d_oldarchlib (oldarchlib.U):
-	This variable conditionally defines OLDARCHLIB to hold the pathname
-	of architecture-dependent library files for a previous
-	version of $package.
+d_oldsock (d_socket.U):
+	This variable conditionally defines the OLDSOCKET symbol, which
+	indicates that the BSD socket interface is based on 4.1c and not 4.2.
 
 d_open3 (d_open3.U):
 	This variable conditionally defines the HAS_OPEN3 manifest constant,
@@ -443,6 +563,11 @@ d_pause (d_pause.U):
 	indicates to the C program that the pause() routine is available
 	to suspend a process until a signal is received.
 
+d_phostname (d_gethname.U):
+	This variable conditionally defines the PHOSTNAME symbol, which
+	contains the shell command which, when fed to popen(), may be
+	used to derive the host name.
+
 d_pipe (d_pipe.U):
 	This variable conditionally defines the HAS_PIPE symbol, which
 	indicates to the C program that the pipe() routine is available
@@ -453,6 +578,21 @@ d_poll (d_poll.U):
 	indicates to the C program that the poll() routine is available
 	to poll active file descriptors.
 
+d_portable (d_portable.U):
+	This variable conditionally defines the PORTABLE symbol, which
+	indicates to the C program that it should not assume that it is
+	running on the machine it was compiled on.
+
+d_pthread_yield (d_pthread_y.U):
+	This variable conditionally defines the HAS_PTHREAD_YIELD
+	symbol if the pthread_yield routine is available to yield
+	the execution of the current thread.
+
+d_pthreads_created_joinable (d_pthreadj.U):
+	This variable conditionally defines the PTHREADS_CREATED_JOINABLE
+	symbol if pthreads are created in the joinable (aka undetached) 
+	state.
+
 d_pwage (i_pwd.U):
 	This varaible conditionally defines PWAGE, which indicates
 	that struct passwd contains pw_age.
@@ -512,6 +652,11 @@ d_sanemcmp (d_sanemcmp.U):
 	the memcpy() routine is available and can be used to compare relative
 	magnitudes of chars with their high bits set.
 
+d_sched_yield (d_pthread_y.U):
+	This variable conditionally defines the HAS_SCHED_YIELD
+	symbol if the sched_yield routine is available to yield
+	the execution of the current thread.
+
 d_seekdir (d_readdir.U):
 	This variable conditionally defines HAS_SEEKDIR if seekdir() is
 	available.
@@ -525,6 +670,18 @@ d_sem (d_sem.U):
 	This variable conditionally defines the HAS_SEM symbol, which
 	indicates that the entire sem*(2) library is present.
 
+d_semctl (d_semctl.U):
+	This variable conditionally defines the HAS_SEMCTL symbol, which
+	indicates to the C program that the semctl() routine is available.
+
+d_semget (d_semget.U):
+	This variable conditionally defines the HAS_SEMGET symbol, which
+	indicates to the C program that the semget() routine is available.
+
+d_semop (d_semop.U):
+	This variable conditionally defines the HAS_SEMOP symbol, which
+	indicates to the C program that the semop() routine is available.
+
 d_setegid (d_setegid.U):
 	This variable conditionally defines the HAS_SETEGID symbol, which
 	indicates to the C program that the setegid() routine is available
@@ -535,6 +692,11 @@ d_seteuid (d_seteuid.U):
 	indicates to the C program that the seteuid() routine is available
 	to change the effective uid of the current program.
 
+d_setgrps (d_setgrps.U):
+	This variable conditionally defines the HAS_SETGROUPS symbol, which
+	indicates to the C program that the setgroups() routine is available
+	to set the list of process groups.
+
 d_setlinebuf (d_setlnbuf.U):
 	This variable conditionally defines the HAS_SETLINEBUF symbol, which
 	indicates to the C program that the setlinebuf() routine is available
@@ -546,19 +708,18 @@ d_setlocale (d_setlocale.U):
 	available to handle locale-specific ctype implementations.
 
 d_setpgid (d_setpgid.U):
-	This variable conditionally defines the HAS_SETPGID symbol, which
-	indicates to the C program that the setpgid(pid, gpid) function
-	is available to set the process group id.
-
-d_setpgrp (d_setpgrp.U):
-	This variable conditionally defines HAS_SETPGRP if setpgrp() is
-	available to set the current process group.
+	This variable conditionally defines the HAS_SETPGID symbol if the
+	setpgid(pid, gpid) function is available to set process group ID.
 
 d_setpgrp2 (d_setpgrp2.U):
 	This variable conditionally defines the HAS_SETPGRP2 symbol, which
 	indicates to the C program that the setpgrp2() (as in DG/UX) routine
 	is available to set the current process group.
 
+d_setpgrp (d_setpgrp.U):
+	This variable conditionally defines HAS_SETPGRP if setpgrp() is
+	available to set the current process group.
+
 d_setprior (d_setprior.U):
 	This variable conditionally defines HAS_SETPRIORITY if setpriority()
 	is available to set a process's priority.
@@ -605,11 +766,27 @@ d_shm (d_shm.U):
 	This variable conditionally defines the HAS_SHM symbol, which
 	indicates that the entire shm*(2) library is present.
 
+d_shmat (d_shmat.U):
+	This variable conditionally defines the HAS_SHMAT symbol, which
+	indicates to the C program that the shmat() routine is available.
+
 d_shmatprototype (d_shmat.U):
 	This variable conditionally defines the HAS_SHMAT_PROTOTYPE 
 	symbol, which indicates that sys/shm.h has a prototype for
 	shmat.
 
+d_shmctl (d_shmctl.U):
+	This variable conditionally defines the HAS_SHMCTL symbol, which
+	indicates to the C program that the shmctl() routine is available.
+
+d_shmdt (d_shmdt.U):
+	This variable conditionally defines the HAS_SHMDT symbol, which
+	indicates to the C program that the shmdt() routine is available.
+
+d_shmget (d_shmget.U):
+	This variable conditionally defines the HAS_SHMGET symbol, which
+	indicates to the C program that the shmget() routine is available.
+
 d_sigaction (d_sigaction.U):
 	This variable conditionally defines the HAS_SIGACTION symbol, which
 	indicates that the Vr4 sigaction() routine is available.
@@ -709,6 +886,10 @@ d_sysconf (d_sysconf.U):
 	indicates to the C program that the sysconf() routine is available
 	to determine system related limits and options.
 
+d_sysernlst (d_strerror.U):
+	This variable conditionally defines HAS_SYS_ERRNOLIST if sys_errnolist[]
+	is available to translate error numbers to the symbolic name.
+
 d_syserrlst (d_strerror.U):
 	This variable conditionally defines HAS_SYS_ERRLIST if sys_errlist[] is
 	available to translate error numbers to strings.
@@ -731,6 +912,11 @@ d_telldir (d_readdir.U):
 	This variable conditionally defines HAS_TELLDIR if telldir() is
 	available.
 
+d_time (d_time.U):
+	This variable conditionally defines the HAS_TIME symbol, which indicates
+	that the time() routine exists.  The time() routine is normaly
+	provided on UNIX systems.
+
 d_times (d_times.U):
 	This variable conditionally defines the HAS_TIMES symbol, which indicates
 	that the times() routine exists.  The times() routine is normaly
@@ -762,6 +948,17 @@ d_void_closedir (d_closedir.U):
 	This variable conditionally defines VOID_CLOSEDIR if closedir()
 	does not return a value.
 
+d_voidsig (d_voidsig.U):
+	This variable conditionally defines VOIDSIG if this system
+	declares "void (*signal(...))()" in signal.h.  The old way was to
+	declare it as "int (*signal(...))()".
+
+d_voidtty (i_sysioctl.U):
+	This variable conditionally defines USE_IOCNOTTY to indicate that the
+	ioctl() call with TIOCNOTTY should be used to void tty association.
+	Otherwise (on USG probably), it is enough to close the standard file
+	decriptors and do a setpgrp().
+
 d_volatile (d_volatile.U):
 	This variable conditionally defines the HASVOLATILE symbol, which
 	indicates to the C program that this C compiler knows about the
@@ -790,6 +987,10 @@ d_wctomb (d_wctomb.U):
 	indicates to the C program that the wctomb() routine is available
 	to convert a wide character to a multibyte.
 
+d_xenix (Guess.U):
+	This variable conditionally defines the symbol XENIX, which alerts
+	the C program that it runs under Xenix.
+
 db_hashtype (i_db.U):
 	This variable contains the type of the hash structure element
 	in the <db.h> header file.  In older versions of DB, it was
@@ -828,8 +1029,13 @@ eunicefix (Init.U):
 	executable by the shell.  On other systems it is a no-op.
 
 exe_ext (Unix.U):
-	This variable defines the extension used for executable files.
-	For unix it is empty.  Other possible values include '.exe'.
+	This is an old synonym for _exe.
+
+extensions (Extensions.U):
+	This variable holds a list of all extension files
+	linked into the package.  It is propagated to Config.pm
+	and is typically used to test whether a particular extesion 
+	is available.
 
 firstmakefile (Unix.U):
 	This variable defines the first file searched by make.  On unix,
@@ -859,21 +1065,68 @@ full_sed (Loc_sed.U):
 	can share this executable will have the same full pathname to
 	'sed.'
 
+gccversion (cc.U):
+	If GNU cc (gcc) is used, this variable holds '1' or '2' to 
+	indicate whether the compiler is version 1 or 2.  This is used in
+	setting some of the default cflags.  It is set to '' if not gcc.
+
 gidtype (gidtype.U):
 	This variable defines Gid_t to be something like gid_t, int,
 	ushort, or whatever type is used to declare the return type
 	of getgid().  Typically, it is the type of group ids in the kernel.
 
+groupcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/group file.  This is normally "cat /etc/group", but can be
+	"ypcat group" when NIS is used.
+
 groupstype (groupstype.U):
 	This variable defines Groups_t to be something like gid_t, int, 
 	ushort, or whatever type is used for the second argument to
-	getgroups().  Usually, this is the same of gidtype, but
-	sometimes it isn't.
+	getgroups() and setgroups().  Usually, this is the same as
+	gidtype (gid_t), but sometimes it isn't.
+
+h_fcntl (h_fcntl.U):
+	This is variable gets set in various places to tell i_fcntl that
+	<fcntl.h> should be included.
+
+h_sysfile (h_sysfile.U):
+	This is variable gets set in various places to tell i_sys_file that
+	<sys/file.h> should be included.
+
+hint (Oldconfig.U):
+	Gives the type of hints used for previous answers. May be one of
+	"default", "recommended" or "previous".
+
+hostcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/hosts file.  This is normally "cat /etc/hosts", but can be
+	"ypcat hosts" when NIS is used.
+
+huge (models.U):
+	This variable contains a flag which will tell the C compiler and loader
+	to produce a program running with a huge memory model.  If the
+	huge model is not supported, contains the flag to produce large
+	model programs.  It is up to the Makefile to use this.
+
+i_bsdioctl (i_sysioctl.U):
+	This variable conditionally defines the I_SYS_BSDIOCTL symbol, which
+	indicates to the C program that <sys/bsdioctl.h> exists and should
+	be included.
+
+i_db (i_db.U):
+	This variable conditionally defines the I_DB symbol, and indicates
+	whether a C program may include Berkeley's DB include file <db.h>.
 
 i_dirent (i_dirent.U):
 	This variable conditionally defines I_DIRENT, which indicates
 	to the C program that it should include <dirent.h>.
 
+i_dld (i_dld.U):
+	This variable conditionally defines the I_DLD symbol, which
+	indicates to the C program that <dld.h> (GNU dynamic loading)
+	exists and should be included.
+
 i_dlfcn (i_dlfcn.U):
 	This variable conditionally defines the I_DLFCN symbol, which
 	indicates to the C program that <dlfcn.h> exists and should
@@ -901,6 +1154,10 @@ i_locale (i_locale.U):
 	This variable conditionally defines the I_LOCALE symbol,
 	and indicates whether a C program should include <locale.h>.
 
+i_malloc (i_malloc.U):
+	This variable conditionally defines the I_MALLOC symbol, and indicates
+	whether a C program should include <malloc.h>.
+
 i_math (i_math.U):
 	This variable conditionally defines the I_MATH symbol, and indicates
 	whether a C program may include <math.h>.
@@ -909,6 +1166,10 @@ i_memory (i_memory.U):
 	This variable conditionally defines the I_MEMORY symbol, and indicates
 	whether a C program should include <memory.h>.
 
+i_netdb (i_netdb.U):
+	This variable conditionally defines the I_NETDB symbol, and indicates
+	whether a C program should include <netdb.h>.
+
 i_neterrno (i_neterrno.U):
 	This variable conditionally defines the I_NET_ERRNO symbol, which
 	indicates to the C program that <net/errno.h> exists and should
@@ -964,6 +1225,16 @@ i_sysfile (i_sysfile.U):
 	This variable conditionally defines the I_SYS_FILE symbol, and indicates
 	whether a C program should include <sys/file.h> to get R_OK and friends.
 
+i_sysfilio (i_sysioctl.U):
+	This variable conditionally defines the I_SYS_FILIO symbol, which
+	indicates to the C program that <sys/filio.h> exists and should
+	be included in preference to <sys/ioctl.h>.
+
+i_sysin (i_niin.U):
+	This variable conditionally defines I_SYS_IN, which indicates
+	to the C program that it should include <sys/in.h> instead of
+	<netinet/in.h>.
+
 i_sysioctl (i_sysioctl.U):
 	This variable conditionally defines the I_SYS_IOCTL symbol, which
 	indicates to the C program that <sys/ioctl.h> exists and should
@@ -986,6 +1257,11 @@ i_sysselct (i_sysselct.U):
 	to the C program that it should include <sys/select.h> in order to
 	get the definition of struct timeval.
 
+i_syssockio (i_sysioctl.U):
+	This variable conditionally defines I_SYS_SOCKIO to indicate to the
+	C program that socket ioctl codes may be found in <sys/sockio.h>
+	instead of <sys/ioctl.h>.
+
 i_sysstat (i_sysstat.U):
 	This variable conditionally defines the I_SYS_STAT symbol,
 	and indicates whether a C program should include <sys/stat.h>.
@@ -1055,20 +1331,60 @@ i_vfork (i_vfork.U):
 	This variable conditionally defines the I_VFORK symbol, and indicates
 	whether a C program should include vfork.h.
 
+incpath (usrinc.U):
+	This variable must preceed the normal include path to get hte
+	right one, as in "$incpath/usr/include" or "$incpath/usr/lib".
+	Value can be "" or "/bsd43" on mips.
+
+installarchlib (archlib.U):
+	This variable is really the same as archlibexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
 installbin (bin.U):
 	This variable is the same as binexp unless AFS is running in which case
 	the user is explicitely prompted for it. This variable should always
 	be used in your makefiles for maximum portability.
 
+installman1dir (man1dir.U):
+	This variable is really the same as man1direxp, unless you are using
+	AFS in which case it points to the read/write location whereas
+	man1direxp only points to the read-only access location. For extra
+	portability, you should only use this variable within your makefiles.
+
+installman3dir (man3dir.U):
+	This variable is really the same as man3direxp, unless you are using
+	AFS in which case it points to the read/write location whereas
+	man3direxp only points to the read-only access location. For extra
+	portability, you should only use this variable within your makefiles.
+
 installprivlib (privlib.U):
 	This variable is really the same as privlibexp but may differ on
 	those systems using AFS. For extra portability, only this variable
 	should be used in makefiles.
 
+installscript (scriptdir.U):
+	This variable is usually the same as scriptdirexp, unless you are on
+	a system running AFS, in which case they may differ slightly. You
+	should always use this variable within your makefiles for portability.
+
+installsitearch (sitearch.U):
+	This variable is really the same as sitearchexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
+installsitelib (sitelib.U):
+	This variable is really the same as sitelibexp but may differ on
+	those systems using AFS. For extra portability, only this variable
+	should be used in makefiles.
+
 intsize (intsize.U):
-	This variable contains the value of the INTSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in an integer.
+	This variable contains the value of the INTSIZE symbol, which
+	indicates to the C program how many bytes there are in an int.
+
+known_extensions (Extensions.U):
+	This variable holds a list of all extensions included in 
+	the package.
 
 large (models.U):
 	This variable contains a flag which will tell the C compiler and loader
@@ -1092,9 +1408,10 @@ ldflags (ccflags.U):
 	the user.  It is up to the Makefile to use this.
 
 lib_ext (Unix.U):
-	This variable defines the extension used for ordinary libraries.
-	For unix, it is '.a'.  The '.' is included.  Other possible
-	values include '.lib'.
+	This is an old synonym for _a.
+
+libc (libc.U):
+	This variable contains the location of the C library.
 
 libperl (libperl.U):
 	The perl executable is obtained by linking perlmain.c with
@@ -1104,37 +1421,56 @@ libperl (libperl.U):
 	the user wishes to build a perl executable with a shared
 	library.
 
+libpth (libpth.U):
+	This variable holds the general path used to find libraries. It is
+	intended to be used by other units.
+
 libs (libs.U):
 	This variable holds the additional libraries we want to use.
 	It is up to the Makefile to deal with it.
 
+libswanted (Myinit.U):
+	This variable holds a list of all the libraries we want to
+	search.  The order is chosen to pick up the c library
+	ahead of ucb or bsd libraries for SVR4.
+
+lkflags (ccflags.U):
+	This variable contains any additional C partial linker flags desired by
+	the user.  It is up to the Makefile to use this.
+
 lns (lns.U):
 	This variable holds the name of the command to make 
 	symbolic links (if they are supported).  It can be used
 	in the Makefile. It is either 'ln -s' or 'ln'
 
+locincpth (ccflags.U):
+	This variable contains a list of additional directories to be
+	searched by the compiler.  The appropriate -I directives will
+	be added to ccflags.  This is intended to simplify setting
+	local directories from the Configure command line.
+	It's not much, but it parallels the loclibpth stuff in libpth.U.
+
+loclibpth (libpth.U):
+	This variable holds the paths used to find local libraries.  It is
+	prepended to libpth, and is intended to be easily set from the
+	command line.
+
 longsize (intsize.U):
-	This variable contains the value of the LONGSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in a long integer.
+	This variable contains the value of the LONGSIZE symbol, which
+	indicates to the C program how many bytes there are in a long.
 
 lseektype (lseektype.U):
 	This variable defines lseektype to be something like off_t, long, 
 	or whatever type is used to declare lseek offset's type in the
 	kernel (which also appears to be lseek's return type).
 
-make (make.U):
-	This variable sets the path to the 'make' command.  It is
-	here rather than in Loc.U so that users can override it
-	with  Configure -Dmake=pmake, or equivalent.
-
 make_set_make (make.U):
 	Some versions of 'make' set the variable MAKE.  Others do not.
 	This variable contains the string to be included in Makefile.SH
 	so that MAKE is set if needed, and not if not needed.
 	Possible values are:
-	make_set_make='#'	# If your make program handles this for you,
-	make_set_make=$make	# if it doesn't.
+	make_set_make='#'		# If your make program handles this for you,
+	make_set_make="MAKE=$make"	# if it doesn't.
 	I used a comment character so that we can distinguish a
 	'set' value (from a previous config.sh or Configure -D option)
 	from an uncomputed value.
@@ -1160,6 +1496,10 @@ man1dir (man1dir.U):
 	Makefile.SH to get the value of this into the proper command.
 	You must be prepared to do the ~name expansion yourself.
 
+man1direxp (man1dir.U):
+	This variable is the same as the man1dir variable, but is filename
+	expanded at configuration time, for convenient use in makefiles.
+
 man1ext (man1dir.U):
 	This variable contains the extension that the manual page should
 	have: one of 'n', 'l', or '1'.  The Makefile must supply the '.'.
@@ -1171,55 +1511,142 @@ man3dir (man3dir.U):
 	Makefile.SH to get the value of this into the proper command.
 	You must be prepared to do the ~name expansion yourself.
 
+man3direxp (man3dir.U):
+	This variable is the same as the man3dir variable, but is filename
+	expanded at configuration time, for convenient use in makefiles.
+
 man3ext (man3dir.U):
 	This variable contains the extension that the manual page should
 	have: one of 'n', 'l', or '3'.  The Makefile must supply the '.'.
 	See man3dir.
 
+medium (models.U):
+	This variable contains a flag which will tell the C compiler and loader
+	to produce a program running with a medium memory model.  If the
+	medium model is not supported, contains the flag to produce large
+	model programs.  It is up to the Makefile to use this.
+
+mips_type (usrinc.U):
+	This variable holds the environment type for the mips system.
+	Possible values are "BSD 4.3" and "System V".
+
+models (models.U):
+	This variable contains the list of memory models supported by this
+	system.  Possible component values are none, split, unsplit, small,
+	medium, large, and huge.  The component values are space separated.
+
 modetype (modetype.U):
 	This variable defines modetype to be something like mode_t, 
 	int, unsigned short, or whatever type is used to declare file 
 	modes for system calls.
 
+myarchname (archname.U):
+	This variable holds the architecture name computed by Configure in
+	a previous run. It is not intended to be perused by any user and
+	should never be set in a hint file.
+
+mydomain (myhostname.U):
+	This variable contains the eventual value of the MYDOMAIN symbol,
+	which is the domain of the host the program is going to run on.
+	The domain must be appended to myhostname to form a complete host name.
+	The dot comes with mydomain, and need not be supplied by the program.
+
+myuname (Oldconfig.U):
+	The output of 'uname -a' if available, otherwise the hostname. On Xenix,
+	pseudo variables assignments in the output are stripped, thank you. The
+	whole thing is then lower-cased.
+
 n (n.U):
 	This variable contains the -n flag if that is what causes the echo
 	command to suppress newline.  Otherwise it is null.  Correct usage is
 	    $echo $n "prompt for a question: $c".
 
+netdb_hlen_type (netdbtype.U):
+	This variable holds the type used for the 2nd argument to
+	gethostbyaddr().  Usually, this is int or size_t or unsigned.
+	This is only useful if you have gethostbyaddr(), naturally.
+
+netdb_host_type (netdbtype.U):
+	This variable holds the type used for the 1st argument to
+	gethostbyaddr().  Usually, this is char * or void *,  possibly
+	with or without a const prefix.
+	This is only useful if you have gethostbyaddr(), naturally.
+
+netdb_name_type (netdbtype.U):
+	This variable holds the type used for the argument to
+	gethostbyname().  Usually, this is char * or const char *.
+	This is only useful if you have gethostbyname(), naturally.
+
+netdb_net_type (netdbtype.U):
+	This variable holds the type used for the 1st argument to
+	getnetbyaddr().  Usually, this is int or long.
+	This is only useful if you have getnetbyaddr(), naturally.
+
+nm_opt (usenm.U):
+	This variable holds the options that may be necessary for nm.
+
+nm_so_opt (usenm.U):
+	This variable holds the options that may be necessary for nm
+	to work on a shared library but that can not be used on an
+	archive library.  Currently, this is only used by Linux, where
+	nm --dynamic is *required* to get symbols from an ELF library which
+	has been stripped, but nm --dynamic is *fatal* on an archive library.
+	Maybe Linux should just always set usenm=false.
+
 o_nonblock (nblock_io.U):
 	This variable bears the symbol value to be used during open() or fcntl()
 	to turn on non-blocking I/O for a file descriptor. If you wish to switch
 	between blocking and non-blocking, you may try ioctl(FIOSNBIO) instead,
 	but that is only supported by some devices.
 
-oldarchlib (oldarchlib.U):
-	This variable holds the name of the directory in which perl5.000
-	and perl5.001 stored 
-	architecture-dependent public library files.
-
-oldarchlibexp (oldarchlib.U):
-	This variable is the same as the oldarchlib variable, but is 
-	filename expanded at configuration time, for convenient use.
+obj_ext (Unix.U):
+	This is an old synonym for _o.
 
 optimize (ccflags.U):
 	This variable contains any optimizer/debugger flag that should be used.
 	It is up to the Makefile to use it.
 
+orderlib (orderlib.U):
+	This variable is "true" if the components of libraries must be ordered
+	(with `lorder $* | tsort`) before placing them in an archive.  Set to
+	"false" if ranlib or ar can generate random libraries.
+
 osname (Oldconfig.U):
 	This variable contains the operating system name (e.g. sunos,
 	solaris, hpux, etc.).  It can be useful later on for setting
 	defaults.  Any spaces are replaced with underscores.  It is set
 	to a null string if we can't figure it out.
 
+osvers (Oldconfig.U):
+	This variable contains the operating system version (e.g.
+	4.1.3, 5.2, etc.).  It is primarily used for helping select
+	an appropriate hints file, but might be useful elsewhere for
+	setting defaults.  It is set to '' if we can't figure it out.
+	We try to be flexible about how much of the version number
+	to keep, e.g. if 4.1.1, 4.1.2, and 4.1.3 are essentially the
+	same for this package, hints files might just be os_4.0 or
+	os_4.1, etc., not keeping separate files for each little release.
+
+package (package.U):
+	This variable contains the name of the package being constructed.
+	It is primarily intended for the use of later Configure units.
+
 pager (pager.U):
 	This variable contains the name of the preferred pager on the system.
 	Usual values are (the full pathnames of) more, less, pg, or cat.
 
+passcat (nis.U):
+	This variable contains a command that produces the text of the
+	/etc/passwd file.  This is normally "cat /etc/passwd", but can be
+	"ypcat passwd" when NIS is used.
+
+patchlevel (patchlevel.U):
+	The patchlevel level of this package.
+	The value of patchlevel comes from the patchlevel.h file.
+
 path_sep (Unix.U):
-	This variable defines the character used to separate elements in
-	the shell's PATH environment variable.  On Unix, it is ':'.
-	This is probably identical to Head.U's p_ variable and can
-	probably be dropped.
+	This is an old synonym for p_ in Head.U, the character
+	used to separate elements in the command shell search PATH.
 
 perladmin (perladmin.U):
 	Electronic mail address of the perl5 administrator.
@@ -1229,6 +1656,21 @@ perlpath (perlpath.U):
 	which contains the name of the perl interpreter to be used in
 	shell scripts and in the "eval 'exec'" idiom.
 
+phostname (myhostname.U):
+	This variable contains the eventual value of the PHOSTNAME symbol,
+	which is a command that can be fed to popen() to get the host name.
+	The program should probably not presume that the domain is or isn't
+	there already.
+
+pidtype (pidtype.U):
+	This variable defines PIDTYPE to be something like pid_t, int, 
+	ushort, or whatever type is used to declare process ids in the kernel.
+
+plibpth (libpth.U):
+	Holds the private path used by Configure to find out the libraries.
+	Its value is prepend to libpth. This variable takes care of special
+	machines, like the mips.  Usually, it should be empty.
+
 prefix (prefix.U):
 	This variable holds the name of the directory below which the
 	user will install the package.  Usually, this is /usr/local, and
@@ -1236,6 +1678,10 @@ prefix (prefix.U):
 	man pages in /usr/local/man, etc.  It is only used to set defaults
 	for things in bin.U, mansrc.U, privlib.U, or scriptdir.U.
 
+prefixexp (prefix.U):
+	This variable holds the full absolute path of the directory below
+	which the user will install the package.  Derived from prefix.
+
 privlib (privlib.U):
 	This variable contains the eventual value of the PRIVLIB symbol,
 	which is the name of the private library for this package.  It may
@@ -1266,6 +1712,11 @@ rd_nodata (nblock_io.U):
 	used, which is a shame because you cannot make the difference between
 	no data and an EOF.. Sigh!
 
+runnm (usenm.U):
+	This variable contains 'true' or 'false' depending whether the
+	nm extraction should be performed or not, according to the value
+	of usenm and the flags on the Configure command line.
+
 scriptdir (scriptdir.U):
 	This variable holds the name of the directory in which the user wants
 	to put publicly scripts for the package in question.  It is either
@@ -1273,6 +1724,10 @@ scriptdir (scriptdir.U):
 	mounted across different architectures, like /usr/share. Programs
 	must be prepared to deal with ~name expansion.
 
+scriptdirexp (scriptdir.U):
+	This variable is the same as scriptdir, but is filename expanded
+	at configuration time, for programs not wanting to bother with it.
+
 selecttype (selecttype.U):
 	This variable holds the type used for the 2nd, 3rd, and 4th
 	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
@@ -1289,14 +1744,17 @@ sh (sh.U):
 	option, though you can override this (and startsh)
 	with -O -Dsh=/bin/whatever -Dstartsh=whatever
 
+sharpbang (spitshell.U):
+	This variable contains the string #! if this system supports that
+	construct.
+
 shmattype (d_shmat.U):
 	This symbol contains the type of pointer returned by shmat().
 	It can be 'void *' or 'char *'.
 
 shortsize (intsize.U):
-	This variable contains the value of the SHORTSIZE symbol,
-	which indicates to the C program how many bytes there are
-	in a short integer.
+	This variable contains the value of the SHORTSIZE symbol which
+	indicates to the C program how many bytes there are in a short.
 
 shrpenv (libperl.U):
 	If the user builds a shared libperl.so, then we need to tell the
@@ -1314,14 +1772,28 @@ shrpenv (libperl.U):
 	as -R $archlibexp/CORE (Solaris, NetBSD) or -Wl,-rpath
 	$archlibexp/CORE (Linux).
 
+shsharp (spitshell.U):
+	This variable tells further Configure units whether your sh can
+	handle # comments.
+
 sig_name (sig_name.U):
 	This variable holds the signal names, space separated. The leading
-	SIG in signals name is removed. See sig_num.
+	SIG in signal name is removed.  A ZERO is prepended to the
+	list.  This is currently not used.
+
+sig_name_init (sig_name.U):
+	This variable holds the signal names, enclosed in double quotes and
+	separated by commas, suitable for use in the SIG_NAME definition 
+	below.  A "ZERO" is prepended to the list, and the list is 
+	terminated with a plain 0.  The leading SIG in signal names
+	is removed. See sig_num.
 
 sig_num (sig_name.U):
-	This variable holds the signal numbers, space separated. Those numbers
-	correspond to the value of the signal listed in the same place within
-	the sig_name list.
+	This variable holds the signal numbers, comma separated. A 0 is
+	prepended to the list (corresponding to the fake SIGZERO), and 
+	the list is terminated with a 0.  Those numbers correspond to 
+	the value of the signal listed in the same place within the
+	sig_name list.
 
 signal_t (d_voidsig.U):
 	This variable holds the type of the signal handler (void or int).
@@ -1356,6 +1828,21 @@ small (models.U):
 	to produce a program running with a small memory model.  It is up to
 	the Makefile to use this.
 
+so (so.U):
+	This variable holds the extension used to identify shared libraries
+	(also known as shared objects) on the system. Usually set to 'so'.
+
+sockethdr (d_socket.U):
+	This variable has any cpp -I flags needed for socket support.
+
+socketlib (d_socket.U):
+	This variable has the names of any libraries needed for socket support.
+
+spackage (package.U):
+	This variable contains the name of the package being constructed,
+	with the first letter uppercased, i.e. suitable for starting
+	sentences.
+
 spitshell (spitshell.U):
 	This variable contains the command necessary to spit out a runnable
 	shell on this system.  It is either cat or a grep -v for # comments.
@@ -1377,7 +1864,7 @@ startperl (startperl.U):
 	script to make sure (hopefully) that it runs with perl and not some
 	shell. Of course, that leading line must be followed by the classical
 	perl idiom:
-		eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
+		eval 'exec perl -S $0 ${1+"$@"}'
 			if $running_under_some_shell;
 	to guarantee perl startup should the shell execute the script. Note
 	that this magic incatation is not understood by csh.
@@ -1395,6 +1882,50 @@ stdchar (stdchar.U):
 	This variable conditionally defines STDCHAR to be the type of char
 	used in stdio.h.  It has the values "unsigned char" or "char".
 
+stdio_base (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_base field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_base(fp).
+
+stdio_bufsiz (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to determine
+	the number of bytes store in the I/O buffer pointer to by the
+	_base field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_bufsiz(fp).
+
+stdio_cnt (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_cnt field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_cnt(fp).
+
+stdio_filbuf (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to tell
+	stdio to refill it's internal buffers (?).  This will
+	be used to define the macro FILE_filbuf(fp).
+
+stdio_ptr (d_stdstdio.U):
+	This variable defines how, given a FILE pointer, fp, to access the
+	_ptr field (or equivalent) of stdio.h's FILE structure.  This will
+	be used to define the macro FILE_ptr(fp).
+
+strings (i_string.U):
+	This variable holds the full path of the string header that will be
+	used. Typically /usr/include/string.h or /usr/include/strings.h.
+
+subversion (patchlevel.U):
+	The subversion level of this package.
+	The value of subversion comes from the patchlevel.h file.
+	This is unique to perl.
+
+sysman (sysman.U):
+	This variable holds the place where the manual is located on this
+	system. It is not the place where the user wants to put his manual
+	pages. Rather it is the place where Configure may look to find manual
+	for unix commands (section 1 of the manual usually). See mansrc.
+
+timeincl (i_time.U):
+	This variable holds the full path of the included time header(s).
+
 timetype (d_time.U):
 	This variable holds the type returned by time(). It can be long,
 	or time_t on BSD sites (in which case <sys/types.h> should be
@@ -1404,15 +1935,64 @@ uidtype (uidtype.U):
 	This variable defines Uid_t to be something like uid_t, int, 
 	ushort, or whatever type is used to declare user ids in the kernel.
 
+usedl (dlsrc.U):
+	This variable indicates if the the system supports dynamic
+	loading of some sort.  See also dlsrc and dlobj.
+
+usemymalloc (mallocsrc.U):
+	This variable contains y if the malloc that comes with this package
+	is desired over the system's version of malloc.  People often include
+	special versions of malloc for effiency, but such versions are often
+	less portable.  See also mallocsrc and mallocobj.
+	If this is 'y', then -lmalloc is removed from $libs.
+
+usenm (usenm.U):
+	This variable contains 'true' or 'false' depending whether the
+	nm extraction is wanted or not.
+
+useopcode (Extensions.U):
+	This variable holds either 'true' or 'false' to indicate
+	whether the Opcode extension should be used.  The sole
+	use for this currently is to allow an easy mechanism
+	for users to skip the Opcode extension from the Configure
+	command line.
+
 useperlio (useperlio.U):
 	This variable conditionally defines the USE_PERLIO symbol,
 	and indicates that the PerlIO abstraction should be
 	used throughout.
 
+useposix (Extensions.U):
+	This variable holds either 'true' or 'false' to indicate
+	whether the POSIX extension should be used.  The sole
+	use for this currently is to allow an easy mechanism
+	for hints files to indicate that POSIX will not compile
+	on a particular system.
+
+usesfio (d_sfio.U):
+	This variable is set to true when the user agrees to use sfio.
+	It is set to false when sfio is not available or when the user
+	explicitely requests not to use sfio.  It is here primarily so
+	that command-line settings can override the auto-detection of
+	d_sfio without running into a "WHOA THERE".
+
 useshrplib (libperl.U):
 	This variable is set to 'yes' if the user wishes
 	to build a shared libperl, and 'no' otherwise.
 
+usethreads (usethreads.U):
+	This variable conditionally defines the USE_THREADS symbol,
+	and indicates that Perl should be built to use threads.
+
+usevfork (d_vfork.U):
+	This variable is set to true when the user accepts to use vfork.
+	It is set to false when no vfork is available or when the user
+	explicitely requests not to use vfork.
+
+usrinc (usrinc.U):
+	This variable holds the path of the include files, which is
+	usually /usr/include. It is mainly used by other Configure units.
+
 voidflags (voidflags.U):
 	This variable contains the eventual value of the VOIDFLAGS symbol,
 	which indicates how much support of the void type is given by this
diff --git a/Porting/config.sh b/Porting/config.sh
new file mode 100644
index 0000000000..59663d958f
--- /dev/null
+++ b/Porting/config.sh
@@ -0,0 +1,525 @@
+#!/bin/sh
+#
+# 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      : perl5
+# Source directory  : .
+# Configuration time: Tue Feb 24 12:39:16 EST 1998
+# Configured by     : doughera
+# Target system     : linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown 
+
+Author=''
+Date='$Date'
+Header=''
+Id='$Id'
+Locker=''
+Log='$Log'
+Mcc='Mcc'
+RCSfile='$RCSfile'
+Revision='$Revision'
+Source=''
+State=''
+_a='.a'
+_exe=''
+_o='.o'
+afs='false'
+alignbytes='4'
+aphostname=''
+ar='ar'
+archlib='/opt/perl/lib/i686-linux-thread/5.00460'
+archlibexp='/opt/perl/lib/i686-linux-thread/5.00460'
+archname='i686-linux-thread'
+archobjs=''
+awk='awk'
+baserev='5.0'
+bash=''
+bin='/opt/perl/bin'
+bincompat3='n'
+binexp='/opt/perl/bin'
+bison=''
+byacc='byacc'
+byteorder='1234'
+c=''
+castflags='1'
+cat='cat'
+cc='cc'
+cccdlflags='-fpic'
+ccdlflags='-rdynamic'
+ccflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -I/usr/local/include'
+cf_by='doughera'
+cf_email='yourname@yourhost.yourplace.com'
+cf_time='Tue Feb 24 12:39:16 EST 1998'
+chgrp=''
+chmod=''
+chown=''
+clocktype='clock_t'
+comm='comm'
+compress=''
+contains='grep'
+cp='cp'
+cpio=''
+cpp='cpp'
+cpp_stuff='42'
+cppflags='-D_REENTRANT -Dbool=char -DHAS_BOOL -I/usr/local/include'
+cpplast='-'
+cppminus='-'
+cpprun='cc -E'
+cppstdin='cc -E'
+cryptlib=''
+csh='csh'
+d_Gconvert='gcvt((x),(n),(b))'
+d_access='define'
+d_alarm='define'
+d_archlib='define'
+d_attribut='define'
+d_bcmp='define'
+d_bcopy='define'
+d_bincompat3='undef'
+d_bsd='undef'
+d_bsdgetpgrp='undef'
+d_bsdsetpgrp='undef'
+d_bzero='define'
+d_casti32='define'
+d_castneg='undef'
+d_charvspr='undef'
+d_chown='define'
+d_chroot='define'
+d_chsize='undef'
+d_closedir='define'
+d_const='define'
+d_crypt='define'
+d_csh='define'
+d_cuserid='define'
+d_dbl_dig='define'
+d_difftime='define'
+d_dirnamlen='undef'
+d_dlerror='define'
+d_dlopen='define'
+d_dlsymun='undef'
+d_dosuid='undef'
+d_dup2='define'
+d_eofnblk='define'
+d_eunice='undef'
+d_fchmod='define'
+d_fchown='define'
+d_fcntl='define'
+d_fd_macros='define'
+d_fd_set='define'
+d_fds_bits='define'
+d_fgetpos='define'
+d_flexfnam='define'
+d_flock='define'
+d_fork='define'
+d_fpathconf='define'
+d_fsetpos='define'
+d_ftime='undef'
+d_getgrps='define'
+d_gethbyaddr='define'
+d_gethbyname='define'
+d_gethent='define'
+d_gethname='undef'
+d_getlogin='define'
+d_getnbyaddr='define'
+d_getpgid='define'
+d_getpgrp2='undef'
+d_getpgrp='define'
+d_getppid='define'
+d_getprior='define'
+d_gettimeod='define'
+d_gnulibc='define'
+d_htonl='define'
+d_index='undef'
+d_inetaton='define'
+d_isascii='define'
+d_killpg='define'
+d_link='define'
+d_locconv='define'
+d_lockf='define'
+d_lstat='define'
+d_mblen='define'
+d_mbstowcs='define'
+d_mbtowc='define'
+d_memcmp='define'
+d_memcpy='define'
+d_memmove='define'
+d_memset='define'
+d_mkdir='define'
+d_mkfifo='define'
+d_mktime='define'
+d_msg='define'
+d_msgctl='define'
+d_msgget='define'
+d_msgrcv='define'
+d_msgsnd='define'
+d_mymalloc='undef'
+d_nice='define'
+d_oldsock='undef'
+d_open3='define'
+d_pathconf='define'
+d_pause='define'
+d_phostname='undef'
+d_pipe='define'
+d_poll='define'
+d_portable='define'
+d_pthread_yield='undef'
+d_pthreads_created_joinable='define'
+d_pwage='undef'
+d_pwchange='undef'
+d_pwclass='undef'
+d_pwcomment='undef'
+d_pwexpire='undef'
+d_pwquota='undef'
+d_readdir='define'
+d_readlink='define'
+d_rename='define'
+d_rewinddir='define'
+d_rmdir='define'
+d_safebcpy='define'
+d_safemcpy='undef'
+d_sanemcmp='define'
+d_sched_yield='define'
+d_seekdir='define'
+d_select='define'
+d_sem='define'
+d_semctl='define'
+d_semget='define'
+d_semop='define'
+d_setegid='define'
+d_seteuid='define'
+d_setgrps='define'
+d_setlinebuf='define'
+d_setlocale='define'
+d_setpgid='define'
+d_setpgrp2='undef'
+d_setpgrp='define'
+d_setprior='define'
+d_setregid='define'
+d_setresgid='undef'
+d_setresuid='undef'
+d_setreuid='define'
+d_setrgid='undef'
+d_setruid='undef'
+d_setsid='define'
+d_sfio='undef'
+d_shm='define'
+d_shmat='define'
+d_shmatprototype='define'
+d_shmctl='define'
+d_shmdt='define'
+d_shmget='define'
+d_sigaction='define'
+d_sigsetjmp='define'
+d_socket='define'
+d_sockpair='define'
+d_statblks='undef'
+d_stdio_cnt_lval='undef'
+d_stdio_ptr_lval='define'
+d_stdiobase='define'
+d_stdstdio='define'
+d_strchr='define'
+d_strcoll='define'
+d_strctcpy='define'
+d_strerrm='strerror(e)'
+d_strerror='define'
+d_strtod='define'
+d_strtol='define'
+d_strtoul='define'
+d_strxfrm='define'
+d_suidsafe='undef'
+d_symlink='define'
+d_syscall='define'
+d_sysconf='define'
+d_sysernlst=''
+d_syserrlst='define'
+d_system='define'
+d_tcgetpgrp='define'
+d_tcsetpgrp='define'
+d_telldir='define'
+d_time='define'
+d_times='define'
+d_truncate='define'
+d_tzname='define'
+d_umask='define'
+d_uname='define'
+d_vfork='undef'
+d_void_closedir='undef'
+d_voidsig='define'
+d_voidtty=''
+d_volatile='define'
+d_vprintf='define'
+d_wait4='define'
+d_waitpid='define'
+d_wcstombs='define'
+d_wctomb='define'
+d_xenix='undef'
+date='date'
+db_hashtype='u_int32_t'
+db_prefixtype='size_t'
+defvoidused='15'
+direntrytype='struct dirent'
+dlext='so'
+dlsrc='dl_dlopen.xs'
+dynamic_ext='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
+eagain='EAGAIN'
+echo='echo'
+egrep='egrep'
+emacs=''
+eunicefix=':'
+exe_ext=''
+expr='expr'
+extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
+find='find'
+firstmakefile='makefile'
+flex=''
+fpostype='fpos_t'
+freetype='void'
+full_csh='/bin/csh'
+full_sed='/bin/sed'
+gcc=''
+gccversion='2.7.2.3'
+gidtype='gid_t'
+glibpth='/usr/shlib  /shlib /lib/pa1.1 /usr/lib/large /lib /usr/lib /usr/lib/386 /lib/386 /lib/large /usr/lib/small /lib/small /usr/ccs/lib /usr/ucblib /usr/local/lib '
+grep='grep'
+groupcat='cat /etc/group'
+groupstype='gid_t'
+gzip='gzip'
+h_fcntl='false'
+h_sysfile='true'
+hint='recommended'
+hostcat='cat /etc/hosts'
+huge=''
+i_bsdioctl=''
+i_db='define'
+i_dbm='define'
+i_dirent='define'
+i_dld='undef'
+i_dlfcn='define'
+i_fcntl='undef'
+i_float='define'
+i_gdbm='define'
+i_grp='define'
+i_limits='define'
+i_locale='define'
+i_malloc='define'
+i_math='define'
+i_memory='undef'
+i_ndbm='define'
+i_netdb='define'
+i_neterrno='undef'
+i_niin='define'
+i_pwd='define'
+i_rpcsvcdbm='undef'
+i_sfio='undef'
+i_sgtty='undef'
+i_stdarg='define'
+i_stddef='define'
+i_stdlib='define'
+i_string='define'
+i_sysdir='define'
+i_sysfile='define'
+i_sysfilio='undef'
+i_sysin='undef'
+i_sysioctl='define'
+i_sysndir='undef'
+i_sysparam='define'
+i_sysresrc='define'
+i_sysselct='define'
+i_syssockio=''
+i_sysstat='define'
+i_systime='define'
+i_systimek='undef'
+i_systimes='define'
+i_systypes='define'
+i_sysun='define'
+i_syswait='define'
+i_termio='undef'
+i_termios='define'
+i_time='undef'
+i_unistd='define'
+i_utime='define'
+i_values='define'
+i_varargs='undef'
+i_varhdr='stdarg.h'
+i_vfork='undef'
+incpath=''
+inews=''
+installarchlib='/opt/perl/lib/i686-linux-thread/5.00460'
+installbin='/opt/perl/bin'
+installman1dir='/opt/perl/man/man1'
+installman3dir='/opt/perl/man/man3'
+installprivlib='/opt/perl/lib'
+installscript='/opt/perl/script'
+installsitearch='/opt/perl/lib/site_perl/i686-linux-thread'
+installsitelib='/opt/perl/lib/site_perl'
+intsize='4'
+known_extensions='B DB_File Fcntl GDBM_File IO NDBM_File ODBM_File Opcode POSIX SDBM_File Socket Thread attrs'
+ksh=''
+large=''
+ld='cc'
+lddlflags='-shared -L/usr/local/lib'
+ldflags=' -L/usr/local/lib'
+less='less'
+lib_ext='.a'
+libc=''
+libperl='libperl.a'
+libpth='/usr/local/lib /lib /usr/lib'
+libs='-lnsl -lndbm -lgdbm -ldbm -ldb -ldl -lm -lpthread -lc -lposix -lcrypt'
+libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m pthread c cposix posix ndir dir crypt ucb BSD PW x'
+line='line'
+lint=''
+lkflags=''
+ln='ln'
+lns='/bin/ln -s'
+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include'
+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib'
+longsize='4'
+lp=''
+lpr=''
+ls='ls'
+lseektype='off_t'
+mail=''
+mailx=''
+make='make'
+make_set_make='#'
+mallocobj=''
+mallocsrc=''
+malloctype='void *'
+man1dir='/opt/perl/man/man1'
+man1direxp='/opt/perl/man/man1'
+man1ext='1'
+man3dir='/opt/perl/man/man3'
+man3direxp='/opt/perl/man/man3'
+man3ext='3'
+medium=''
+mips=''
+mips_type=''
+mkdir='mkdir'
+models='none'
+modetype='mode_t'
+more='more'
+mv=''
+myarchname='i686-linux'
+mydomain='.yourplace.com'
+myhostname='yourhost'
+myuname='linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown '
+n='-n'
+netdb_hlen_type='int'
+netdb_host_type='const char *'
+netdb_name_type='const char *'
+netdb_net_type='unsigned long'
+nm_opt=''
+nm_so_opt='--dynamic'
+nroff='nroff'
+o_nonblock='O_NONBLOCK'
+obj_ext='.o'
+optimize='-O'
+orderlib='false'
+osname='linux'
+osvers='2.0.33'
+package='perl5'
+pager='/usr/bin/less'
+passcat='cat /etc/passwd'
+patchlevel='4'
+path_sep=':'
+perl='perl'
+perladmin='yourname@yourhost.yourplace.com'
+perlpath='/opt/perl/bin/perl'
+pg='pg'
+phostname=''
+pidtype='pid_t'
+plibpth=''
+pmake=''
+pr=''
+prefix='/opt/perl'
+prefixexp='/opt/perl'
+privlib='/opt/perl/lib'
+privlibexp='/opt/perl/lib'
+prototype='define'
+randbits='31'
+ranlib=':'
+rd_nodata='-1'
+rm='rm'
+rmail=''
+runnm='false'
+scriptdir='/opt/perl/script'
+scriptdirexp='/opt/perl/script'
+sed='sed'
+selecttype='fd_set *'
+sendmail='sendmail'
+sh='/bin/sh'
+shar=''
+sharpbang='#!'
+shmattype='void *'
+shortsize='2'
+shrpenv=''
+shsharp='true'
+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR UNUSED IOT CLD POLL '
+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "IOT", "CLD", "POLL", 0'
+sig_num='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 17, 29, 0'
+signal_t='void'
+sitearch='/opt/perl/lib/site_perl/i686-linux-thread'
+sitearchexp='/opt/perl/lib/site_perl/i686-linux-thread'
+sitelib='/opt/perl/lib/site_perl'
+sitelibexp='/opt/perl/lib/site_perl'
+sizetype='size_t'
+sleep=''
+smail=''
+small=''
+so='so'
+sockethdr=''
+socketlib=''
+sort='sort'
+spackage='Perl5'
+spitshell='cat'
+split=''
+src='.'
+ssizetype='ssize_t'
+startperl='#!/opt/perl/bin/perl'
+startsh='#!/bin/sh'
+static_ext=' '
+stdchar='char'
+stdio_base='((fp)->_IO_read_base)'
+stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)'
+stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)'
+stdio_filbuf=''
+stdio_ptr='((fp)->_IO_read_ptr)'
+strings='/usr/include/string.h'
+submit=''
+subversion='60'
+sysman='/usr/man/man1'
+tail=''
+tar=''
+tbl=''
+test='test'
+timeincl='/usr/include/sys/time.h '
+timetype='time_t'
+touch='touch'
+tr='tr'
+troff=''
+uidtype='uid_t'
+uname='uname'
+uniq='uniq'
+usedl='define'
+usemymalloc='n'
+usenm='false'
+useopcode='true'
+useperlio='undef'
+useposix='true'
+usesfio='false'
+useshrplib='false'
+usethreads='define'
+usevfork='false'
+usrinc='/usr/include'
+uuname=''
+vi=''
+voidflags='15'
+xlibpth='/usr/lib/386 /lib/386'
+zcat=''
+zip='zip'
+PATCHLEVEL=4
+SUBVERSION=60
+CONFIG=true
diff --git a/config_H b/Porting/config_H
index 87fc608c65..ec3fbdba18 100644
--- a/config_H
+++ b/Porting/config_H
@@ -11,30 +11,24 @@
  * that running config_h.SH again will wipe out any changes you've made.
  * For a more permanent change edit config.sh and rerun config_h.SH.
  *
- * $Id: Config_h.U,v 3.0.1.4 1995/09/25 09:10:49 ram Exp $
+ * $Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $
  */
 
-/* Configuration time: Wed Sep 11 15:24:25 EDT 1996
- * Configured by: doughera
- * Target system: sunos fractal 5.5 generic i86pc i386 i86pc 
+/*
+ * Package name      : perl5
+ * Source directory  : .
+ * Configuration time: Tue Feb 24 12:39:16 EST 1998
+ * Configured by     : doughera
+ * Target system     : linux fractal 2.0.33 #1 tue feb 3 10:11:46 est 1998 i686 unknown 
  */
 
 #ifndef _config_h_
 #define _config_h_
 
-/* MEM_ALIGNBYTES:
- *	This symbol contains the number of bytes required to align a
- *	double. Usual values are 2, 4 and 8.
- */
-#define MEM_ALIGNBYTES 4	/**/
-
-/* ARCHNAME:
- *	This symbol holds a string representing the architecture name.
- *	It may be used to construct an architecture-dependant pathname
- *	where library files may be held under a private library, for
- *	instance.
+/* LOC_SED:
+ *	This symbol holds the complete pathname to the sed program.
  */
-#define ARCHNAME "unknown"	/**/
+#define LOC_SED 	"/bin/sed"	/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -47,36 +41,6 @@
 #define BIN "/opt/perl/bin"	/**/
 #define BIN_EXP "/opt/perl/bin"	/**/
 
-/* CAT2:
- *	This macro catenates 2 tokens together.
- */
-/* STRINGIFY:
- *	This macro surrounds its token with double quotes.
- */
-#if 42 == 1
-#define CAT2(a,b)a/**/b
-#define CAT3(a,b,c)a/**/b/**/c
-#define CAT4(a,b,c,d)a/**/b/**/c/**/d
-#define CAT5(a,b,c,d,e)a/**/b/**/c/**/d/**/e
-#define STRINGIFY(a)"a"
-		/* If you can get stringification with catify, tell me how! */
-#endif
-#if 42 == 42
-#define CAT2(a,b)a ## b
-#define CAT3(a,b,c)a ## b ## c
-#define CAT4(a,b,c,d)a ## b ## c ## d
-#define CAT5(a,b,c,d,e)a ## b ## c ## d ## e
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
-#define SCAT2(a,b)StGiFy(a) StGiFy(b)
-#define SCAT3(a,b,c)StGiFy(a) StGiFy(b) StGiFy(c)
-#define SCAT4(a,b,c,d)StGiFy(a) StGiFy(b) StGiFy(c) StGiFy(d)
-#define SCAT5(a,b,c,d,e)StGiFy(a) StGiFy(b) StGiFy(c) StGiFy(d) StGiFy(e)
-#endif
-#ifndef CAT2
-#include "Bletch: How does this C preprocessor catenate tokens?"
-#endif
-
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
  *	the C preprocessor on the standard input and produce to standard
@@ -102,7 +66,7 @@
  *	This symbol indicates the C compiler can check for function attributes,
  *	such as printf formats. This is normally only supported by GNU cc.
  */
-/*#define HASATTRIBUTE 	/ **/
+#define HASATTRIBUTE 	/**/
 #ifndef HASATTRIBUTE
 #define __attribute__(_arg_)
 #endif
@@ -125,27 +89,6 @@
  */
 #define HAS_BZERO	/**/
 
-/* CASTI32:
- *	This symbol is defined if the C compiler can cast negative
- *	or large floating point numbers to 32-bit ints.
- */
-#define	CASTI32		/**/
-
-/* CASTNEGFLOAT:
- *	This symbol is defined if the C compiler can cast negative
- *	numbers to unsigned longs, ints and shorts.
- */
-/* CASTFLAGS:
- *	This symbol contains flags that say what difficulties the compiler
- *	has casting odd floating values to unsigned long:
- *		0 = ok
- *		1 = couldn't cast < 0
- *		2 = couldn't cast >= 0x80000000
- *		4 = couldn't cast in argument expression list
- */
-#define	CASTNEGFLOAT		/**/
-#define CASTFLAGS 0		/**/
-
 /* HAS_CHOWN:
  *	This symbol, if defined, indicates that the chown routine is
  *	available.
@@ -164,12 +107,6 @@
  */
 /*#define	HAS_CHSIZE		/ **/
 
-/* VOID_CLOSEDIR:
- *	This symbol, if defined, indicates that the closedir() routine
- *	does not return a value.
- */
-/*#define VOID_CLOSEDIR		/ **/
-
 /* HASCONST:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the const type. There is no need to actually test for that symbol
@@ -214,6 +151,26 @@
  */
 #define HAS_DLERROR	/**/
 
+/* SETUID_SCRIPTS_ARE_SECURE_NOW:
+ *	This symbol, if defined, indicates that the bug that prevents
+ *	setuid scripts from being secure is not present in this kernel.
+ */
+/* DOSUID:
+ *	This symbol, if defined, indicates that the C program should
+ *	check the script that it is executing for setuid/setgid bits, and
+ *	attempt to emulate setuid/setgid on systems that have disabled
+ *	setuid #! scripts because the kernel can't do it securely.
+ *	It is up to the package designer to make sure that this emulation
+ *	is done securely.  Among other things, it should do an fstat on
+ *	the script it just opened to make sure it really is a setuid/setgid
+ *	script, it should make sure the arguments passed correspond exactly
+ *	to the argument on the #! line, and it should not trust any
+ *	subprocesses to which it must pass the filename rather than the
+ *	file descriptor of the script to be executed.
+ */
+/*#define SETUID_SCRIPTS_ARE_SECURE_NOW	/ **/
+/*#define DOSUID		/ **/
+
 /* HAS_DUP2:
  *	This symbol, if defined, indicates that the dup2 routine is
  *	available to duplicate file descriptors.
@@ -254,7 +211,7 @@
  *	This symbol, if defined, indicates that the flock routine is
  *	available to do file locking.
  */
-/*#define HAS_FLOCK		/ **/
+#define HAS_FLOCK		/**/
 
 /* HAS_FORK:
  *	This symbol, if defined, indicates that the fork routine is
@@ -274,7 +231,7 @@
  *	<sys/resource.h> needs to be included (see I_SYS_RESOURCE).
  *	The type "Timeval" should be used to refer to "struct timeval".
  */
-/*#define HAS_GETTIMEOFDAY	/ **/
+#define HAS_GETTIMEOFDAY	/**/
 #ifdef HAS_GETTIMEOFDAY
 #define Timeval struct timeval	/* Structure used by gettimeofday() */
 #endif
@@ -284,13 +241,7 @@
  *	available to get the list of process groups.  If unavailable, multiple
  *	groups are probably not supported.
  */
-/* HAS_SETGROUPS:
- *	This symbol, if defined, indicates that the setgroups() routine is
- *	available to set the list of process groups.  If unavailable, multiple
- *	groups are probably not supported.
- */
 #define HAS_GETGROUPS		/**/
-#define HAS_SETGROUPS		/**/
 
 /* HAS_GETHOSTENT:
  *	This symbol, if defined, indicates that the gethostent routine is
@@ -311,6 +262,24 @@
  */
 #define HAS_GETLOGIN		/**/
 
+/* HAS_GETPGID:
+ *	This symbol, if defined, indicates to the C program that 
+ *	the getpgid(pid) function is available to get the
+ *	process group id.
+ */
+#define HAS_GETPGID		/**/
+
+/* HAS_GETPGRP:
+ *	This symbol, if defined, indicates that the getpgrp routine is
+ *	available to get the current process group.
+ */
+/* USE_BSD_GETPGRP:
+ *	This symbol, if defined, indicates that getpgrp needs one
+ *	arguments whereas USG one needs none.
+ */
+#define HAS_GETPGRP		/**/
+/*#define USE_BSD_GETPGRP	/ **/
+
 /* HAS_GETPGRP2:
  *	This symbol, if defined, indicates that the getpgrp2() (as in DG/UX)
  *	routine is available to get the current process group.
@@ -354,11 +323,12 @@
 #define HAS_NTOHL		/**/
 #define HAS_NTOHS		/**/
 
-/* HAS_ISASCII:
- *	This manifest constant lets the C program know that isascii 
- *	is available.
+/* HAS_INET_ATON:
+ *	This symbol, if defined, indicates to the C program that the
+ *	inet_aton() function is available to parse IP address "dotted-quad"
+ *	strings.
  */
-#define HAS_ISASCII		/**/
+#define HAS_INET_ATON		/**/
 
 /* HAS_KILLPG:
  *	This symbol, if defined, indicates that the killpg routine is available
@@ -468,12 +438,6 @@
  */
 #define HAS_NICE		/**/
 
-/* HAS_OPEN3:
- *	This manifest constant lets the C program know that the three
- *	argument form of open(2) is available.
- */
-#define HAS_OPEN3		/**/
-
 /* HAS_PATHCONF:
  *	This symbol, if defined, indicates that pathconf() is available
  *	to determine file-system related limits and options associated
@@ -501,7 +465,8 @@
 
 /* HAS_POLL:
  *	This symbol, if defined, indicates that the poll routine is
- *	available to poll active file descriptors.
+ *	available to poll active file descriptors. You may safely
+ *	include <poll.h> when this symbol is defined.
  */
 #define HAS_POLL		/**/
 
@@ -550,29 +515,6 @@
  */
 #define HAS_RMDIR		/**/
 
-/* HAS_SAFE_BCOPY:
- *	This symbol, if defined, indicates that the bcopy routine is available
- *	to copy potentially overlapping memory blocks. Otherwise you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-#define HAS_SAFE_BCOPY	/**/
-
-/* HAS_SAFE_MEMCPY:
- *	This symbol, if defined, indicates that the memcpy routine is available
- *	to copy potentially overlapping memory blocks. Otherwise you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-/*#define HAS_SAFE_MEMCPY	/ **/
-
-/* HAS_SANE_MEMCMP:
- *	This symbol, if defined, indicates that the memcmp routine is available
- *	and can be used to compare relative magnitudes of chars with their high
- *	bits set.  If it is not defined, roll your own version.
- */
-/*#define HAS_SANE_MEMCMP	/ **/
-
 /* HAS_SELECT:
  *	This symbol, if defined, indicates that the select routine is
  *	available to select active file descriptors. If the timeout field
@@ -611,6 +553,24 @@
  */
 #define HAS_SETLOCALE	/**/
 
+/* HAS_SETPGID:
+ *	This symbol, if defined, indicates that the setpgid(pid, gpid)
+ *	routine is available to set process group ID.
+ */
+#define HAS_SETPGID	/**/
+
+/* HAS_SETPGRP:
+ *	This symbol, if defined, indicates that the setpgrp routine is
+ *	available to set the current process group.
+ */
+/* USE_BSD_SETPGRP:
+ *	This symbol, if defined, indicates that setpgrp needs two
+ *	arguments whereas USG one needs none.  See also HAS_SETPGID
+ *	for a POSIX interface.
+ */
+#define HAS_SETPGRP		/**/
+/*#define USE_BSD_SETPGRP	/ **/
+
 /* HAS_SETPGRP2:
  *	This symbol, if defined, indicates that the setpgrp2() (as in DG/UX)
  *	routine is available to set the current process group.
@@ -687,12 +647,6 @@
 #define Shmat_t void *	/**/
 #define HAS_SHMAT_PROTOTYPE	/**/
 
-/* HAS_SIGACTION:
- *	This symbol, if defined, indicates that Vr4's sigaction() routine
- *	is available.
- */
-#define HAS_SIGACTION	/**/
-
 /* HAS_SOCKET:
  *	This symbol, if defined, indicates that the BSD socket interface is
  *	supported.
@@ -708,66 +662,7 @@
  *	This symbol is defined if this system has a stat structure declaring
  *	st_blksize and st_blocks.
  */
-#define USE_STAT_BLOCKS 	/**/
-
-/* USE_STDIO_PTR:
- *	This symbol is defined if the _ptr and _cnt fields (or similar)
- *	of the stdio FILE structure can be used to access the stdio buffer
- *	for a file handle.  If this is defined, then the FILE_ptr(fp)
- *	and FILE_cnt(fp) macros will also be defined and should be used
- *	to access these fields.
- */
-/* FILE_ptr:
- *	This macro is used to access the _ptr field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_PTR_LVALUE:
- *	This symbol is defined if the FILE_ptr macro can be used as an
- *	lvalue.
- */
-/* FILE_cnt:
- *	This macro is used to access the _cnt field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_CNT_LVALUE:
- *	This symbol is defined if the FILE_cnt macro can be used as an
- *	lvalue.
- */
-#define USE_STDIO_PTR 	/**/
-#ifdef USE_STDIO_PTR
-#define FILE_ptr(fp)	((fp)->_ptr)
-#define STDIO_PTR_LVALUE 		/**/
-#define FILE_cnt(fp)	((fp)->_cnt)
-#define STDIO_CNT_LVALUE 		/**/
-#endif
-
-/* USE_STDIO_BASE:
- *	This symbol is defined if the _base field (or similar) of the
- *	stdio FILE structure can be used to access the stdio buffer for
- *	a file handle.  If this is defined, then the FILE_base(fp) macro
- *	will also be defined and should be used to access this field.
- *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
- *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
- *	will never be defined unless USE_STDIO_PTR is.
- */
-/* FILE_base:
- *	This macro is used to access the _base field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_BASE is defined.
- */
-/* FILE_bufsiz:
- *	This macro is used to determine the number of bytes in the I/O
- *	buffer pointed to by _base field (or equivalent) of the FILE
- *	structure pointed to its argument. This macro will always be defined
- *	if USE_STDIO_BASE is defined.
- */
-#define USE_STDIO_BASE 	/**/
-#ifdef USE_STDIO_BASE
-#define FILE_base(fp)	((fp)->_base)
-#define FILE_bufsiz(fp)	((fp)->_cnt + (fp)->_ptr - (fp)->_base)
-#endif
+/*#define USE_STAT_BLOCKS 	/ **/
 
 /* HAS_STRCHR:
  *	This symbol is defined to indicate that the strchr()/strrchr()
@@ -910,14 +805,6 @@
  */
 /*#define HAS_VFORK	/ **/
 
-/* Signal_t:
- *	This symbol's value is either "void" or "int", corresponding to the
- *	appropriate return type of a signal handler.  Thus, you can declare
- *	a signal handler using "Signal_t (*handler)()", and define the
- *	handler using "Signal_t handler(sig)".
- */
-#define Signal_t void	/* Signal handler's return type */
-
 /* HASVOLATILE:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the volatile declaration.
@@ -927,20 +814,6 @@
 #define volatile
 #endif
 
-/* HAS_VPRINTF:
- *	This symbol, if defined, indicates that the vprintf routine is available
- *	to printf with a pointer to an argument list.  If unavailable, you
- *	may need to write your own, probably in terms of _doprnt().
- */
-/* USE_CHAR_VSPRINTF:
- *	This symbol is defined if this system has vsprintf() returning type
- *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
- *	is up to the package author to declare vsprintf correctly based on the
- *	symbol.
- */
-#define HAS_VPRINTF	/**/
-/*#define USE_CHAR_VSPRINTF 	/ **/
-
 /* HAS_WAIT4:
  *	This symbol, if defined, indicates that wait4() exists.
  */
@@ -980,30 +853,16 @@
  */
 #define Gid_t gid_t		/* Type for getgid(), etc... */
 
-/* Groups_t:
- *	This symbol holds the type used for the second argument to
- *	[gs]etgroups().  Usually, this is the same of gidtype, but
- *	sometimes it isn't.  It can be int, ushort, uid_t, etc... 
- *	It may be necessary to include <sys/types.h> to get any 
- *	typedef'ed information.  This is only required if you have
- *	getgroups() or setgroups().
- */
-#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS)
-#define Groups_t gid_t	/* Type for 2nd arg to [gs]etgroups() */
-#endif
-
-/* DB_Prefix_t:
- *	This symbol contains the type of the prefix structure element
- *	in the <db.h> header file.  In older versions of DB, it was
- *	int, while in newer ones it is u_int32_t.
+/* I_DBM:
+ *	This symbol, if defined, indicates that <dbm.h> exists and should
+ *	be included.
  */
-/* DB_Hash_t:
- *	This symbol contains the type of the prefix structure element
- *	in the <db.h> header file.  In older versions of DB, it was
- *	int, while in newer ones it is size_t.
+/* I_RPCSVC_DBM:
+ *	This symbol, if defined, indicates that <rpcsvc/dbm.h> exists and
+ *	should be included.
  */
-#define DB_Hash_t	int		/**/
-#define DB_Prefix_t	int  	/**/
+#define I_DBM	/**/
+/*#define I_RPCSVC_DBM	/ **/
 
 /* I_DIRENT:
  *	This symbol, if defined, indicates to the C program that it should
@@ -1034,7 +893,7 @@
 /* I_FCNTL:
  *	This manifest constant tells the C program to include <fcntl.h>.
  */
-#define I_FCNTL	/**/
+/*#define I_FCNTL	/ **/
 
 /* I_FLOAT:
  *	This symbol, if defined, indicates to the C program that it should
@@ -1056,6 +915,12 @@
  */
 #define I_LIMITS		/**/
 
+/* I_LOCALE:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <locale.h>.
+ */
+#define	I_LOCALE		/**/
+
 /* I_MATH:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <math.h>.
@@ -1116,11 +981,17 @@
  */
 #define I_PWD		/**/
 /*#define PWQUOTA	/ **/
-#define PWAGE	/**/
+/*#define PWAGE	/ **/
 /*#define PWCHANGE	/ **/
 /*#define PWCLASS	/ **/
 /*#define PWEXPIRE	/ **/
-#define PWCOMMENT	/**/
+/*#define PWCOMMENT	/ **/
+
+/* I_SFIO:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sfio.h>.
+ */
+/*#define	I_SFIO		/ **/
 
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
@@ -1144,13 +1015,13 @@
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/dir.h>.
  */
-/*#define I_SYS_DIR		/ **/
+#define I_SYS_DIR		/**/
 
 /* I_SYS_FILE:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/file.h> to get definition of R_OK and friends.
  */
-/*#define I_SYS_FILE		/ **/
+#define I_SYS_FILE		/**/
 
 /* I_SYS_IOCTL:
  *	This symbol, if defined, indicates that <sys/ioctl.h> exists and should
@@ -1182,6 +1053,12 @@
  */
 #define I_SYS_SELECT	/**/
 
+/* I_SYS_STAT:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/stat.h>.
+ */
+#define	I_SYS_STAT		/**/
+
 /* I_SYS_TIMES:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/times.h>.
@@ -1226,22 +1103,6 @@
 #define I_TERMIOS		/**/
 /*#define I_SGTTY		/ **/
 
-/* I_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <time.h>.
- */
-/* I_SYS_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h>.
- */
-/* I_SYS_TIME_KERNEL:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h> with KERNEL defined.
- */
-/*#define I_TIME		/ **/
-#define I_SYS_TIME		/**/
-/*#define I_SYS_TIME_KERNEL		/ **/
-
 /* I_UNISTD:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <unistd.h>.
@@ -1254,6 +1115,14 @@
  */
 #define I_UTIME		/**/
 
+/* I_VALUES:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <values.h> to get definition of symbols like MINFLOAT or
+ *	MAXLONG, i.e. machine dependant limitations.  Probably, you
+ *	should use <limits.h> instead, if it is available.
+ */
+#define I_VALUES		/**/
+
 /* I_STDARG:
  *	This symbol, if defined, indicates that <stdarg.h> exists and should
  *	be included.
@@ -1271,22 +1140,6 @@
  */
 /*#define I_VFORK	/ **/
 
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
- */
-#define INTSIZE 4		/**/
-#define LONGSIZE 4		/**/
-#define SHORTSIZE 2		/**/
-
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.
  *	It can be int, long, off_t, etc... It may be necessary to include
@@ -1294,6 +1147,21 @@
  */
 #define Off_t off_t		/* <offset> type */
 
+/* Free_t:
+ *	This variable contains the return type of free().  It is usually
+ * void, but occasionally int.
+ */
+/* Malloc_t:
+ *	This symbol is the type of pointer returned by malloc and realloc.
+ */
+#define Malloc_t void *			/**/
+#define Free_t void			/**/
+
+/* MYMALLOC:
+ *	This symbol, if defined, indicates that we're using our own malloc.
+ */
+/*#define MYMALLOC			/ **/
+
 /* Mode_t:
  *	This symbol holds the type used to declare file modes 
  *	for systems calls.  It is usually mode_t, but may be
@@ -1302,32 +1170,12 @@
  */
 #define Mode_t mode_t	 /* file mode parameter for system calls */
 
-/* VAL_O_NONBLOCK:
- *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
- *	non-blocking I/O for the file descriptor. Note that there is no way
- *	back, i.e. you cannot turn it blocking again this way. If you wish to
- *	alternatively switch between blocking and non-blocking, use the
- *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
- */
-/* VAL_EAGAIN:
- *	This symbol holds the errno error code set by read() when no data was
- *	present on the non-blocking file descriptor.
- */
-/* RD_NODATA:
- *	This symbol holds the return code from read() when no data is present
- *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
- *	not defined, then you can't distinguish between no data and EOF by
- *	issuing a read(). You'll have to find another way to tell for sure!
- */
-/* EOF_NONBLOCK:
- *	This symbol, if defined, indicates to the C program that a read() on
- *	a non-blocking file descriptor will return 0 on EOF, and not the value
- *	held in RD_NODATA (-1 usually, in that case!).
+/* Pid_t:
+ *	This symbol holds the type used to declare process ids in the kernel.
+ *	It can be int, uint, pid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
  */
-#define VAL_O_NONBLOCK O_NONBLOCK
-#define VAL_EAGAIN EAGAIN
-#define RD_NODATA -1
-#define EOF_NONBLOCK
+#define Pid_t pid_t		/* PID type */
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -1347,19 +1195,14 @@
 #define	_(args) ()
 #endif
 
-/* RANDBITS:
- *	This symbol contains the number of bits of random number the rand()
- *	function produces.  Usual values are 15, 16, and 31.
- */
-#define RANDBITS 15		/**/
-
-/* Select_fd_set_t:
- *	This symbol holds the type used for the 2nd, 3rd, and 4th
- *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
- *	is defined, and 'int *' otherwise.  This is only useful if you 
- *	have select(), of course.
+/* SH_PATH:
+ *	This symbol contains the full pathname to the shell used on this
+ *	on this system to execute Bourne shell scripts.  Usually, this will be
+ *	/bin/sh, though it's possible that some systems will have /bin/ksh,
+ *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
+ *	D:/bin/sh.exe.
  */
-#define Select_fd_set_t 	fd_set *	/**/
+#define SH_PATH "/bin/sh"  /**/
 
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
@@ -1369,21 +1212,11 @@
  */
 #define Size_t size_t	 /* length paramater for string functions */
 
-/* SSize_t:
- *	This symbol holds the type used by functions that return
- *	a count of bytes or an error condition.  It must be a signed type.
- *	It is usually ssize_t, but may be long or int, etc.
- *	It may be necessary to include <sys/types.h> or <unistd.h>
- *	to get any typedef'ed information.
- *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
- */
-#define SSize_t ssize_t	 /* signed count of bytes */
-
 /* STDCHAR:
  *	This symbol is defined to be the type of char used in stdio.h.
  *	It has the values "unsigned char" or "char".
  */
-#define STDCHAR unsigned char	/**/
+#define STDCHAR char	/**/
 
 /* Uid_t:
  *	This symbol holds the type used to declare user ids in the kernel.
@@ -1392,44 +1225,46 @@
  */
 #define Uid_t uid_t		/* UID type */
 
-/* LOC_SED:
- *	This symbol holds the complete pathname to the sed program.
- */
-#define LOC_SED 	"/bin/sed"	/**/
-
-/* OSNAME:
- *	This symbol contains the name of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
- */
-#define OSNAME "solaris"		/**/
-
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for perl5.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of ARCHLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
+/* VOIDFLAGS:
+ *	This symbol indicates how much support of the void type is given by this
+ *	compiler.  What various bits mean:
+ *
+ *	    1 = supports declaration of void
+ *	    2 = supports arrays of pointers to functions returning void
+ *	    4 = supports comparisons between pointers to void functions and
+ *		    addresses of void functions
+ *	    8 = suports declaration of generic void pointers
+ *
+ *	The package designer should define VOIDUSED to indicate the requirements
+ *	of the package.  This can be done either by #defining VOIDUSED before
+ *	including config.h, or by defining defvoidused in Myinit.U.  If the
+ *	latter approach is taken, only those flags will be tested.  If the
+ *	level of void support necessary is not present, defines void to int.
  */
-#define ARCHLIB "/opt/perl/lib/i86pc-solaris/5.00305"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/i86pc-solaris/5.00305"		/**/
+#ifndef VOIDUSED
+#define VOIDUSED 15
+#endif
+#define VOIDFLAGS 15
+#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
+#define void int		/* is void to be avoided? */
+#define M_VOID			/* Xenix strikes again */
+#endif
 
-/* BINCOMPAT3:
- *	This symbol, if defined, indicates that Perl 5.004 should be
- *	binary-compatible with Perl 5.003.
+/* MEM_ALIGNBYTES:
+ *	 This symbol contains the number of bytes required to align a
+ *	 double. Usual values are 2, 4 and 8.
+ *	 On NeXT starting with 3.2, you can build "Fat" Multiple Architecture
+ *	 Binaries (MAB) for targets with varying alignment.  This only matters
+ *	 for perl, where the config.h can be generated and installed on one
+ *	 system, and used by a different architecture to build an extension.
+ *	 The default is eight, for safety.
  */
-#define BINCOMPAT3		/**/
+#define MEM_ALIGNBYTES 4	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
  *	i.e. 0x1234 or 0x4321, etc...
- *	On NeXT 4 (and greater), you can build "Fat" Multiple Architecture
+ *	On NeXT 3.2 (and greater), you can build "Fat" Multiple Architecture
  *	Binaries (MAB) on either big endian or little endian machines.
  *	The endian-ness is available at compile-time.  This only matters
  *	for perl, where the config.h can be generated and installed on 
@@ -1449,39 +1284,32 @@
 #endif /* ENDIAN CHECK */
 #endif /* NeXT */
 
-/* CSH:
- *	This symbol, if defined, indicates that the C-shell exists.
- *	If defined, contains the full pathname of csh.
+/* CASTI32:
+ *	This symbol is defined if the C compiler can cast negative
+ *	or large floating point numbers to 32-bit ints.
  */
-#define CSH "/bin/csh"		/**/
+#define	CASTI32		/**/
 
-/* DLSYM_NEEDS_UNDERSCORE:
- *	This symbol, if defined, indicates that we need to prepend an
- *	underscore to the symbol name before calling dlsym().  This only
- *	makes sense if you *have* dlsym, which we will presume is the
- *	case if you're using dl_dlopen.xs.
+/* CASTNEGFLOAT:
+ *	This symbol is defined if the C compiler can cast negative
+ *	numbers to unsigned longs, ints and shorts.
  */
-/*#define 	DLSYM_NEEDS_UNDERSCORE 	/ **/
-
-/* SETUID_SCRIPTS_ARE_SECURE_NOW:
- *	This symbol, if defined, indicates that the bug that prevents
- *	setuid scripts from being secure is not present in this kernel.
+/* CASTFLAGS:
+ *	This symbol contains flags that say what difficulties the compiler
+ *	has casting odd floating values to unsigned long:
+ *		0 = ok
+ *		1 = couldn't cast < 0
+ *		2 = couldn't cast >= 0x80000000
+ *		4 = couldn't cast in argument expression list
  */
-/* DOSUID:
- *	This symbol, if defined, indicates that the C program should
- *	check the script that it is executing for setuid/setgid bits, and
- *	attempt to emulate setuid/setgid on systems that have disabled
- *	setuid #! scripts because the kernel can't do it securely.
- *	It is up to the package designer to make sure that this emulation
- *	is done securely.  Among other things, it should do an fstat on
- *	the script it just opened to make sure it really is a setuid/setgid
- *	script, it should make sure the arguments passed correspond exactly
- *	to the argument on the #! line, and it should not trust any
- *	subprocesses to which it must pass the filename rather than the
- *	file descriptor of the script to be executed.
+/*#define	CASTNEGFLOAT		/ **/
+#define CASTFLAGS 1		/**/
+
+/* VOID_CLOSEDIR:
+ *	This symbol, if defined, indicates that the closedir() routine
+ *	does not return a value.
  */
-#define SETUID_SCRIPTS_ARE_SECURE_NOW	/**/
-/*#define DOSUID		/ **/
+/*#define VOID_CLOSEDIR		/ **/
 
 /* Gconvert:
  *	This preprocessor macro is defined to convert a floating point
@@ -1498,64 +1326,53 @@
  *		d_Gconvert='sprintf((b),"%.*g",(n),(x))'
  *	The last two assume trailing zeros should not be kept.
  */
-#define Gconvert(x,n,t,b) gconvert((x),(n),(t),(b))
+#define Gconvert(x,n,t,b) gcvt((x),(n),(b))
 
-/* HAS_GETPGID:
+/* HAS_GNULIBC:
  *	This symbol, if defined, indicates to the C program that 
- *	the getpgid(pid) function is available to get the
- *	process group id.
+ *	the GNU C library is being used.
  */
-#define HAS_GETPGID		/**/
-
-/* HAS_GETPGRP:
- *	This symbol, if defined, indicates that the getpgrp routine is
- *	available to get the current process group.
- */
-/* USE_BSD_GETPGRP:
- *	This symbol, if defined, indicates that getpgrp needs one
- *	arguments whereas USG one needs none.
+#define HAS_GNULIBC  	/**/
+/* HAS_ISASCII:
+ *	This manifest constant lets the C program know that isascii 
+ *	is available.
  */
-#define HAS_GETPGRP		/**/
-/*#define USE_BSD_GETPGRP	/ **/
+#define HAS_ISASCII		/**/
 
-/* HAS_INET_ATON:
- *	This symbol, if defined, indicates to the C program that the
- *	inet_aton() function is available to parse IP address "dotted-quad"
- *	strings.
+/* HAS_OPEN3:
+ *	This manifest constant lets the C program know that the three
+ *	argument form of open(2) is available.
  */
-#define HAS_INET_ATON		/**/
+#define HAS_OPEN3		/**/
 
-/* HAS_SETPGID:
- *	This symbol, if defined, indicates to the C program that 
- *	the setpgid(pid, gpid) function is available to set the
- *	process group id.
+/* HAS_SAFE_BCOPY:
+ *	This symbol, if defined, indicates that the bcopy routine is available
+ *	to copy potentially overlapping memory blocks. Otherwise you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
  */
-#define HAS_SETPGID		/**/
+#define HAS_SAFE_BCOPY	/**/
 
-/* HAS_SETPGRP:
- *	This symbol, if defined, indicates that the setpgrp routine is
- *	available to set the current process group.
- */
-/* USE_BSD_SETPGRP:
- *	This symbol, if defined, indicates that setpgrp needs two
- *	arguments whereas USG one needs none.  See also HAS_SETPGID
- *	for a POSIX interface.
+/* HAS_SAFE_MEMCPY:
+ *	This symbol, if defined, indicates that the memcpy routine is available
+ *	to copy potentially overlapping memory blocks. Otherwise you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
  */
-/* USE_BSDPGRP:
- *	This symbol, if defined, indicates that the BSD notion of process
- *	group is to be used. For instance, you have to say setpgrp(pid, pgrp)
- *	instead of the USG setpgrp().  This should be obsolete since
- *	there are systems which have BSD-ish setpgrp but USG-ish getpgrp.
+/*#define HAS_SAFE_MEMCPY	/ **/
+
+/* HAS_SANE_MEMCMP:
+ *	This symbol, if defined, indicates that the memcmp routine is available
+ *	and can be used to compare relative magnitudes of chars with their high
+ *	bits set.  If it is not defined, roll your own version.
  */
-#define HAS_SETPGRP		/**/
-/*#define USE_BSD_SETPGRP	/ **/
-/*#define USE_BSDPGRP		/ **/
+#define HAS_SANE_MEMCMP	/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
+/* HAS_SIGACTION:
+ *	This symbol, if defined, indicates that Vr4's sigaction() routine
+ *	is available.
  */
-/*#define	USE_SFIO		/ **/
+#define HAS_SIGACTION	/**/
 
 /* Sigjmp_buf:
  *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
@@ -1581,78 +1398,236 @@
 #define Siglongjmp(buf,retval) longjmp((buf),(retval))
 #endif
 
-/* USE_DYNAMIC_LOADING:
- *	This symbol, if defined, indicates that dynamic loading of
- *	some sort is available.
+/* USE_STDIO_PTR:
+ *	This symbol is defined if the _ptr and _cnt fields (or similar)
+ *	of the stdio FILE structure can be used to access the stdio buffer
+ *	for a file handle.  If this is defined, then the FILE_ptr(fp)
+ *	and FILE_cnt(fp) macros will also be defined and should be used
+ *	to access these fields.
  */
-#define USE_DYNAMIC_LOADING		/**/
+/* FILE_ptr:
+ *	This macro is used to access the _ptr field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_PTR_LVALUE:
+ *	This symbol is defined if the FILE_ptr macro can be used as an
+ *	lvalue.
+ */
+/* FILE_cnt:
+ *	This macro is used to access the _cnt field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_CNT_LVALUE:
+ *	This symbol is defined if the FILE_cnt macro can be used as an
+ *	lvalue.
+ */
+#define USE_STDIO_PTR 	/**/
+#ifdef USE_STDIO_PTR
+#define FILE_ptr(fp)	((fp)->_IO_read_ptr)
+#define STDIO_PTR_LVALUE 		/**/
+#define FILE_cnt(fp)	((fp)->_IO_read_end - (fp)->_IO_read_ptr)
+/*#define STDIO_CNT_LVALUE 		/ **/
+#endif
 
-/* I_DBM:
- *	This symbol, if defined, indicates that <dbm.h> exists and should
- *	be included.
+/* USE_STDIO_BASE:
+ *	This symbol is defined if the _base field (or similar) of the
+ *	stdio FILE structure can be used to access the stdio buffer for
+ *	a file handle.  If this is defined, then the FILE_base(fp) macro
+ *	will also be defined and should be used to access this field.
+ *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
+ *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
+ *	will never be defined unless USE_STDIO_PTR is.
  */
-/* I_RPCSVC_DBM:
- *	This symbol, if defined, indicates that <rpcsvc/dbm.h> exists and
- *	should be included.
+/* FILE_base:
+ *	This macro is used to access the _base field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_BASE is defined.
+ */
+/* FILE_bufsiz:
+ *	This macro is used to determine the number of bytes in the I/O
+ *	buffer pointed to by _base field (or equivalent) of the FILE
+ *	structure pointed to its argument. This macro will always be defined
+ *	if USE_STDIO_BASE is defined.
  */
-/*#define I_DBM	/ **/
-#define I_RPCSVC_DBM	/**/
+#define USE_STDIO_BASE 	/**/
+#ifdef USE_STDIO_BASE
+#define FILE_base(fp)	((fp)->_IO_read_base)
+#define FILE_bufsiz(fp)	((fp)->_IO_read_end - (fp)->_IO_read_base)
+#endif
 
-/* I_LOCALE:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <locale.h>.
+/* HAS_VPRINTF:
+ *	This symbol, if defined, indicates that the vprintf routine is available
+ *	to printf with a pointer to an argument list.  If unavailable, you
+ *	may need to write your own, probably in terms of _doprnt().
  */
-#define	I_LOCALE		/**/
+/* USE_CHAR_VSPRINTF:
+ *	This symbol is defined if this system has vsprintf() returning type
+ *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
+ *	is up to the package author to declare vsprintf correctly based on the
+ *	symbol.
+ */
+#define HAS_VPRINTF	/**/
+/*#define USE_CHAR_VSPRINTF 	/ **/
 
-/* I_SFIO:
+/* I_TIME:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
+ *	include <time.h>.
  */
-/*#define	I_SFIO		/ **/
-
-/* I_SYS_STAT:
+/* I_SYS_TIME:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/stat.h>.
+ *	include <sys/time.h>.
  */
-#define	I_SYS_STAT		/**/
-
-/* I_VALUES:
+/* I_SYS_TIME_KERNEL:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <values.h> to get definition of symbols like MINFLOAT or
- *	MAXLONG, i.e. machine dependant limitations.  Probably, you
- *	should use <limits.h> instead, if it is available.
+ *	include <sys/time.h> with KERNEL defined.
  */
-#define I_VALUES		/**/
+/*#define I_TIME		/ **/
+#define I_SYS_TIME		/**/
+/*#define I_SYS_TIME_KERNEL		/ **/
 
-/* Free_t:
- *	This variable contains the return type of free().  It is usually
- * void, but occasionally int.
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
  */
-/* Malloc_t:
- *	This symbol is the type of pointer returned by malloc and realloc.
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
  */
-#define Malloc_t void *			/**/
-#define Free_t void			/**/
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+#define INTSIZE 4		/**/
+#define LONGSIZE 4		/**/
+#define SHORTSIZE 2		/**/
 
-/* MYMALLOC:
- *	This symbol, if defined, indicates that we're using our own malloc.
+/* VAL_O_NONBLOCK:
+ *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
+ *	non-blocking I/O for the file descriptor. Note that there is no way
+ *	back, i.e. you cannot turn it blocking again this way. If you wish to
+ *	alternatively switch between blocking and non-blocking, use the
+ *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
+ */
+/* VAL_EAGAIN:
+ *	This symbol holds the errno error code set by read() when no data was
+ *	present on the non-blocking file descriptor.
+ */
+/* RD_NODATA:
+ *	This symbol holds the return code from read() when no data is present
+ *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
+ *	not defined, then you can't distinguish between no data and EOF by
+ *	issuing a read(). You'll have to find another way to tell for sure!
  */
-#define MYMALLOC			/**/
+/* EOF_NONBLOCK:
+ *	This symbol, if defined, indicates to the C program that a read() on
+ *	a non-blocking file descriptor will return 0 on EOF, and not the value
+ *	held in RD_NODATA (-1 usually, in that case!).
+ */
+#define VAL_O_NONBLOCK O_NONBLOCK
+#define VAL_EAGAIN EAGAIN
+#define RD_NODATA -1
+#define EOF_NONBLOCK
 
-/* OLDARCHLIB:
+/* RANDBITS:
+ *	This symbol contains the number of bits of random number the rand()
+ *	function produces.  Usual values are 15, 16, and 31.
+ */
+#define RANDBITS 31		/**/
+
+/* SSize_t:
+ *	This symbol holds the type used by functions that return
+ *	a count of bytes or an error condition.  It must be a signed type.
+ *	It is usually ssize_t, but may be long or int, etc.
+ *	It may be necessary to include <sys/types.h> or <unistd.h>
+ *	to get any typedef'ed information.
+ *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
+ */
+#define SSize_t ssize_t	 /* signed count of bytes */
+
+/* OSNAME:
+ *	This symbol contains the name of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+#define OSNAME "linux"		/**/
+
+/* ARCHLIB:
  *	This variable, if defined, holds the name of the directory in
- *	which the user has perl5.000 or perl5.001 architecture-dependent
- *	public library files for perl5.  For the most part, these
- *	files will work with 5.002 (and later), but that is not
- *	guaranteed.
+ *	which the user wants to put architecture-dependent public
+ *	library files for perl5.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
  */
-/* OLDARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of OLDARCHLIB, to be
- *	used in programs that are not prepared to deal with ~ expansion at 
- *	run-time.
+/* ARCHLIB_EXP:
+ *	This symbol contains the ~name expanded version of ARCHLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-/*#define OLDARCHLIB ""		/ **/
-/*#define OLDARCHLIB_EXP ""		/ **/
+#define ARCHLIB "/opt/perl/lib/i686-linux-thread/5.00460"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/i686-linux-thread/5.00460"		/**/
+
+/* CAT2:
+ *	This macro catenates 2 tokens together.
+ */
+/* STRINGIFY:
+ *	This macro surrounds its token with double quotes.
+ */
+#if 42 == 1
+#define CAT2(a,b)a/**/b
+#define STRINGIFY(a)"a"
+		/* If you can get stringification with catify, tell me how! */
+#endif
+#if 42 == 42
+#define CAT2(a,b)a ## b
+#define StGiFy(a)# a
+#define STRINGIFY(a)StGiFy(a)
+#endif
+#if 42 != 1 && 42 != 42
+#include "Bletch: How does this C preprocessor catenate tokens?"
+#endif
+
+/* CSH:
+ *	This symbol, if defined, indicates that the C-shell exists.
+ *	If defined, contains the full pathname of csh.
+ */
+#define CSH "/bin/csh"		/**/
+
+/* HAS_SETGROUPS:
+ *	This symbol, if defined, indicates that the setgroups() routine is
+ *	available to set the list of process groups.  If unavailable, multiple
+ *	groups are probably not supported.
+ */
+#define HAS_SETGROUPS		/**/
+
+/* Signal_t:
+ *	This symbol's value is either "void" or "int", corresponding to the
+ *	appropriate return type of a signal handler.  Thus, you can declare
+ *	a signal handler using "Signal_t (*handler)()", and define the
+ *	handler using "Signal_t handler(sig)".
+ */
+#define Signal_t void	/* Signal handler's return type */
+
+/* Groups_t:
+ *	This symbol holds the type used for the second argument to
+ *	getgroups() and setgropus().  Usually, this is the same as
+ *	gidtype (gid_t) , but sometimes it isn't.
+ *	It can be int, ushort, uid_t, etc... 
+ *	It may be necessary to include <sys/types.h> to get any 
+ *	typedef'ed information.  This is only required if you have
+ *	getgroups() or setgropus()..
+ */
+#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS)
+#define Groups_t gid_t	/* Type for 2nd arg to [sg]etgroups() */
+#endif
+
+/* I_NETDB:
+ *	This symbol, if defined, indicates that <netdb.h> exists and
+ *	should be included.
+ */
+#define I_NETDB		/**/
 
 /* PRIVLIB:
  *	This symbol contains the name of the private library for this package.
@@ -1667,15 +1642,6 @@
 #define PRIVLIB "/opt/perl/lib"		/**/
 #define PRIVLIB_EXP "/opt/perl/lib"		/**/
 
-/* SH_PATH:
- *	This symbol contains the full pathname to the shell used on this
- *	on this system to execute Bourne shell scripts.  Usually, this will be
- *	/bin/sh, though it's possible that some systems will have /bin/ksh,
- *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
- *	D:/bin/sh.exe.
- */
-#define SH_PATH "/bin/sh"  /**/
-
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
  *	signal number. This is intended
@@ -1704,8 +1670,8 @@
  *	The last element is 0, corresponding to the 0 at the end of
  *	the sig_name list.
  */
-#define SIG_NAME "ZERO","HUP","INT","QUIT","ILL","TRAP","ABRT","EMT","FPE","KILL","BUS","SEGV","SYS","PIPE","ALRM","TERM","USR1","USR2","CHLD","PWR","WINCH","URG","IO","STOP","TSTP","CONT","TTIN","TTOU","VTALRM","PROF","XCPU","XFSZ","WAITING","LWP","FREEZE","THAW","CANCEL","RTMIN","NUM38","NUM39","NUM40","NUM41","NUM42","NUM43","RTMAX","IOT","CLD","POLL",0	/**/
-#define SIG_NUM 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,6,18,22,0	/**/
+#define SIG_NAME "ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "UNUSED", "IOT", "CLD", "POLL", 0		/**/
+#define SIG_NUM  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 6, 17, 29, 0			/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1720,8 +1686,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/opt/perl/lib/site_perl/i86pc-solaris"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/i86pc-solaris"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/i686-linux-thread"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/i686-linux-thread"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -1739,6 +1705,39 @@
 #define SITELIB "/opt/perl/lib/site_perl"		/**/
 #define SITELIB_EXP "/opt/perl/lib/site_perl"		/**/
 
+/* DLSYM_NEEDS_UNDERSCORE:
+ *	This symbol, if defined, indicates that we need to prepend an
+ *	underscore to the symbol name before calling dlsym().  This only
+ *	makes sense if you *have* dlsym, which we will presume is the
+ *	case if you're using dl_dlopen.xs.
+ */
+/*#define 	DLSYM_NEEDS_UNDERSCORE 	/ **/
+
+/* USE_SFIO:
+ *	This symbol, if defined, indicates that sfio should
+ *	be used.
+ */
+/*#define	USE_SFIO		/ **/
+
+/* USE_DYNAMIC_LOADING:
+ *	This symbol, if defined, indicates that dynamic loading of
+ *	some sort is available.
+ */
+#define USE_DYNAMIC_LOADING		/**/
+
+/* DB_Prefix_t:
+ *	This symbol contains the type of the prefix structure element
+ *	in the <db.h> header file.  In older versions of DB, it was
+ *	int, while in newer ones it is u_int32_t.
+ */
+/* DB_Hash_t:
+ *	This symbol contains the type of the prefix structure element
+ *	in the <db.h> header file.  In older versions of DB, it was
+ *	int, while in newer ones it is size_t.
+ */
+#define DB_Hash_t	u_int32_t		/**/
+#define DB_Prefix_t	size_t  	/**/
+
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
  *	script to make sure (one hopes) that it runs with perl and not
@@ -1753,29 +1752,60 @@
  */
 /*#define	USE_PERLIO		/ **/
 
-/* VOIDFLAGS:
- *	This symbol indicates how much support of the void type is given by this
- *	compiler.  What various bits mean:
- *
- *	    1 = supports declaration of void
- *	    2 = supports arrays of pointers to functions returning void
- *	    4 = supports comparisons between pointers to void functions and
- *		    addresses of void functions
- *	    8 = suports declaration of generic void pointers
- *
- *	The package designer should define VOIDUSED to indicate the requirements
- *	of the package.  This can be done either by #defining VOIDUSED before
- *	including config.h, or by defining defvoidused in Myinit.U.  If the
- *	latter approach is taken, only those flags will be tested.  If the
- *	level of void support necessary is not present, defines void to int.
+/* Netdb_host_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyaddr().
  */
-#ifndef VOIDUSED
-#define VOIDUSED 15
-#endif
-#define VOIDFLAGS 15
-#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
-#define void int		/* is void to be avoided? */
-#define M_VOID			/* Xenix strikes again */
-#endif
+/* Netdb_hlen_t:
+ *	This symbol holds the type used for the 2nd argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_name_t:
+ *	This symbol holds the type used for the argument to
+ *	gethostbyname().
+ */
+/* Netdb_net_t:
+ *	This symbol holds the type used for the 1st argument to
+ *	getnetbyaddr().
+ */
+#define Netdb_host_t		const char * /**/
+#define Netdb_hlen_t		int /**/
+#define Netdb_name_t		const char * /**/
+#define Netdb_net_t		unsigned long /**/
+
+/* Select_fd_set_t:
+ *	This symbol holds the type used for the 2nd, 3rd, and 4th
+ *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
+ *	is defined, and 'int *' otherwise.  This is only useful if you 
+ *	have select(), of course.
+ */
+#define Select_fd_set_t 	fd_set *	/**/
+
+/* ARCHNAME:
+ *	This symbol holds a string representing the architecture name.
+ *	It may be used to construct an architecture-dependant pathname
+ *	where library files may be held under a private library, for
+ *	instance.
+ */
+#define ARCHNAME "i686-linux-thread"		/**/
+
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield 
+ *	routine is available to yield the execution of the current
+ *	thread.
+ */
+/*#define HAS_PTHREAD_YIELD	/ **/
+
+/* PTHREADS_CREATED_JOINABLE:
+ *	This symbol, if defined, indicates that pthreads are created
+ *	in the joinable (aka undetached) state.
+ */
+#define PTHREADS_CREATED_JOINABLE /**/
+
+/* USE_THREADS:
+ *	This symbol, if defined, indicates that Perl should
+ *	be built to use threads.
+ */
+#define	USE_THREADS		/**/
 
 #endif
diff --git a/Porting/pumpkin.pod b/Porting/pumpkin.pod
index 6706c6c3c4..885c813dfa 100644
--- a/Porting/pumpkin.pod
+++ b/Porting/pumpkin.pod
@@ -217,9 +217,11 @@ patch these directly; patch the data files instead.
 
 F<Configure> and F<config_h.SH> are also automatically generated by
 B<metaconfig>.  In general, you should patch the metaconfig units
-instead of patching these files directly.  However, minor changes to
+instead of patching these files directly.  However, very minor changes to
 F<Configure> may be made in between major sync-ups with the metaconfig
-units, which tends to be complicated operations.
+units, which tends to be complicated operations.  But be careful, this
+can quickly spiral out of control.  Running metaconfig is not really
+hard.
 
 =head1 How to Make a Distribution
 
@@ -357,14 +359,19 @@ permissions for system files; something like that might be appropriate.
 This will build a config.sh and config.h.  You can skip this if you haven't
 changed Configure or config_h.SH at all.
 
-=head2 Update config_H
+=head2 Update Porting/config_H
 
-The config_H file is provided to help those folks who can't run Configure.
-It is important to keep it up-to-date.  If you have changed config_h.SH,
-those changes must be reflected in config_H as well.  (The name config_H was
-chosen to distinguish the file from config.h even on case-insensitive file
-systems.)  Simply edit the existing config_H file; keep the first few
-explanatory lines and then copy your new config.h below.
+[This section needs revision.  We're currently working on easing
+the task of keeping the vms, win32, and plan9 config.sh info
+up-to-date.]
+
+The Porting/config_H file is provided to help those folks who can't
+run Configure.  It is important to keep it up-to-date.  If you have
+changed config_h.SH, those changes must be reflected in config_H as well.
+(The name config_H was chosen to distinguish the file from config.h even
+on case-insensitive file systems.)  Simply edit the existing config_H
+file; keep the first few explanatory lines and then copy your new
+config.h below.
 
 It may also be necessary to update vms/config.vms and
 plan9/config.plan9, though you should be quite careful in doing so if
diff --git a/config_h.SH b/config_h.SH
index 5dd59fc5fa..f74da6286c 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -25,47 +25,24 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  * that running config_h.SH again will wipe out any changes you've made.
  * For a more permanent change edit config.sh and rerun config_h.SH.
  *
- * \$Id: Config_h.U,v 3.0.1.4 1995/09/25 09:10:49 ram Exp $
+ * \$Id: Config_h.U,v 3.0.1.5 1997/02/28 14:57:43 ram Exp $
  */
 
-/* Configuration time: $cf_time
- * Configured by: $cf_by
- * Target system: $myuname
+/*
+ * Package name      : $package
+ * Source directory  : $src
+ * Configuration time: $cf_time
+ * Configured by     : $cf_by
+ * Target system     : $myuname
  */
 
 #ifndef _config_h_
 #define _config_h_
 
-/* MEM_ALIGNBYTES:
- *	This symbol contains the number of bytes required to align a
- *	double. Usual values are 2, 4 and 8.
- *	On NeXT starting with 3.2, you can build "Fat" Multiple Architecture
- *	Binaries (MAB) for targets with varying alignment.  This only matters
- *	for perl, where the config.h can be generated and installed on one
- *	system, and used by a different architecture to build an extension.
- *	The default is eight, for safety.
- */
-#ifndef NeXT
-#define MEM_ALIGNBYTES $alignbytes	/**/
-#else  /* NeXT */
-#ifdef __m68k__
-#define MEM_ALIGNBYTES 2
-#else
-#ifdef __i386__
-#define MEM_ALIGNBYTES 4
-#else /* __hppa__, __sparc__ and default for unknown architectures */
-#define MEM_ALIGNBYTES 8
-#endif /* __i386__ */
-#endif /* __m68k__ */
-#endif /* NeXT */
-
-/* ARCHNAME:
- *	This symbol holds a string representing the architecture name.
- *	It may be used to construct an architecture-dependant pathname
- *	where library files may be held under a private library, for
- *	instance.
+/* LOC_SED:
+ *	This symbol holds the complete pathname to the sed program.
  */
-#define ARCHNAME "$archname"		/**/
+#define LOC_SED 	"$full_sed"	/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -78,36 +55,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define BIN "$bin"	/**/
 #define BIN_EXP "$binexp"	/**/
 
-/* CAT2:
- *	This macro catenates 2 tokens together.
- */
-/* STRINGIFY:
- *	This macro surrounds its token with double quotes.
- */
-#if $cpp_stuff == 1
-#define CAT2(a,b)a/**/b
-#define CAT3(a,b,c)a/**/b/**/c
-#define CAT4(a,b,c,d)a/**/b/**/c/**/d
-#define CAT5(a,b,c,d,e)a/**/b/**/c/**/d/**/e
-#define STRINGIFY(a)"a"
-		/* If you can get stringification with catify, tell me how! */
-#endif
-#if $cpp_stuff == 42
-#define CAT2(a,b)a ## b
-#define CAT3(a,b,c)a ## b ## c
-#define CAT4(a,b,c,d)a ## b ## c ## d
-#define CAT5(a,b,c,d,e)a ## b ## c ## d ## e
-#define StGiFy(a)# a
-#define STRINGIFY(a)StGiFy(a)
-#define SCAT2(a,b)StGiFy(a) StGiFy(b)
-#define SCAT3(a,b,c)StGiFy(a) StGiFy(b) StGiFy(c)
-#define SCAT4(a,b,c,d)StGiFy(a) StGiFy(b) StGiFy(c) StGiFy(d)
-#define SCAT5(a,b,c,d,e)StGiFy(a) StGiFy(b) StGiFy(c) StGiFy(d) StGiFy(e)
-#endif
-#ifndef CAT2
-#include "Bletch: How does this C preprocessor catenate tokens?"
-#endif
-
 /* CPPSTDIN:
  *	This symbol contains the first part of the string which will invoke
  *	the C preprocessor on the standard input and produce to standard
@@ -156,27 +103,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_bzero HAS_BZERO	/**/
 
-/* CASTI32:
- *	This symbol is defined if the C compiler can cast negative
- *	or large floating point numbers to 32-bit ints.
- */
-#$d_casti32	CASTI32		/**/
-
-/* CASTNEGFLOAT:
- *	This symbol is defined if the C compiler can cast negative
- *	numbers to unsigned longs, ints and shorts.
- */
-/* CASTFLAGS:
- *	This symbol contains flags that say what difficulties the compiler
- *	has casting odd floating values to unsigned long:
- *		0 = ok
- *		1 = couldn't cast < 0
- *		2 = couldn't cast >= 0x80000000
- *		4 = couldn't cast in argument expression list
- */
-#$d_castneg	CASTNEGFLOAT		/**/
-#define CASTFLAGS $castflags		/**/
-
 /* HAS_CHOWN:
  *	This symbol, if defined, indicates that the chown routine is
  *	available.
@@ -195,12 +121,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_chsize	HAS_CHSIZE		/**/
 
-/* VOID_CLOSEDIR:
- *	This symbol, if defined, indicates that the closedir() routine
- *	does not return a value.
- */
-#$d_void_closedir VOID_CLOSEDIR		/**/
-
 /* HASCONST:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the const type. There is no need to actually test for that symbol
@@ -245,6 +165,26 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_dlerror HAS_DLERROR	/**/
 
+/* SETUID_SCRIPTS_ARE_SECURE_NOW:
+ *	This symbol, if defined, indicates that the bug that prevents
+ *	setuid scripts from being secure is not present in this kernel.
+ */
+/* DOSUID:
+ *	This symbol, if defined, indicates that the C program should
+ *	check the script that it is executing for setuid/setgid bits, and
+ *	attempt to emulate setuid/setgid on systems that have disabled
+ *	setuid #! scripts because the kernel can't do it securely.
+ *	It is up to the package designer to make sure that this emulation
+ *	is done securely.  Among other things, it should do an fstat on
+ *	the script it just opened to make sure it really is a setuid/setgid
+ *	script, it should make sure the arguments passed correspond exactly
+ *	to the argument on the #! line, and it should not trust any
+ *	subprocesses to which it must pass the filename rather than the
+ *	file descriptor of the script to be executed.
+ */
+#$d_suidsafe SETUID_SCRIPTS_ARE_SECURE_NOW	/**/
+#$d_dosuid DOSUID		/**/
+
 /* HAS_DUP2:
  *	This symbol, if defined, indicates that the dup2 routine is
  *	available to duplicate file descriptors.
@@ -315,13 +255,7 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	available to get the list of process groups.  If unavailable, multiple
  *	groups are probably not supported.
  */
-/* HAS_SETGROUPS:
- *	This symbol, if defined, indicates that the setgroups() routine is
- *	available to set the list of process groups.  If unavailable, multiple
- *	groups are probably not supported.
- */
 #$d_getgrps HAS_GETGROUPS		/**/
-#$d_setgrps HAS_SETGROUPS		/**/
 
 /* HAS_GETHOSTENT:
  *	This symbol, if defined, indicates that the gethostent routine is
@@ -329,81 +263,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_gethent HAS_GETHOSTENT		/**/
 
-/* HAS_GETHOSTBYADDR:
- *	This symbol, if defined, indicates that the gethostbyaddr routine is
- *	available to lookup hosts by their IP addresses.
- */
-#$d_gethbyaddr HAS_GETHOSTBYADDR		/**/
-
-/* Netdb_host_t:
- *	This symbol holds the type used for the 1st argument
- *	to gethostbyaddr().
- */
-#define Netdb_host_t		$netdb_host_type
-
-/* Netdb_hlen_t:
- *	This symbol holds the type used for the 2nd argument
- *	to gethostbyaddr().
- */
-#define Netdb_hlen_t		$netdb_hlen_type
-
-/* HAS_GETHOSTBYNAME:
- *	This symbol, if defined, indicates that the gethostbyname routine is
- *	available to lookup hosts by their DNS names.
- */
-#$d_gethbyname HAS_GETHOSTBYNAME		/**/
-
-/* Netdb_name_t:
- *	This symbol holds the type used for the 1st argument
- *	to gethostbyname(), the 1st argument to getnetbyname(),
- *	the 1st argument to getprotobyname(), the 1st argument to
- *	getservbyname(), the 2nd argument to getservbyname(),
- *	and the 2nd argument to getservbyport().
- */
-#define Netdb_name_t		$netdb_name_type
-
-/* HAS_GETNETBYADDR:
- *	This symbol, if defined, indicates that the getnetbyaddr routine is
- *	available to lookup networks by their IP addresses.
- */
-#$d_getnbyaddr HAS_GETNETBYADDR		/**/
-
-/* Netdb_net_t:
- *	This symbol holds the type used for the 1st argument
- *	to getnetbyaddr().
- */
-#define Netdb_net_t		$netdb_net_type
-
-/* HAS_GETNETBYNAME:
- *	This symbol, if defined, indicates that the getnetbyname routine is
- *	available to lookup networks by their names.
- */
-#$d_getnbyname HAS_GETNETBYNAME		/**/
-
-/* HAS_GETPROTOBYNAME:
- *	This symbol, if defined, indicates that the getprotobyname routine is
- *	available to lookup protocols by their names.
- */
-#$d_getpbyname HAS_GETPROTOBYNAME		/**/
-
-/* HAS_GETPROTOBYNUMBER:
- *	This symbol, if defined, indicates that the getprotobynumber routine is
- *	available to lookup protocols by their numbers.
- */
-#$d_getpbynumber HAS_GETPROTOBYNUMBER		/**/
-
-/* HAS_GETSERVBYNAME:
- *	This symbol, if defined, indicates that the getservbyname routine is
- *	available to lookup services by their names.
- */
-#$d_getsbyname HAS_GETSERVBYNAME		/**/
-
-/* HAS_GETSERVBYPORT:
- *	This symbol, if defined, indicates that the getservbyport routine is
- *	available to lookup services by their ports.
- */
-#$d_getsbyport HAS_GETSERVBYPORT		/**/
-
 /* HAS_UNAME:
  *	This symbol, if defined, indicates that the C program may use the
  *	uname() routine to derive the host name.  See also HAS_GETHOSTNAME
@@ -417,6 +276,24 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_getlogin HAS_GETLOGIN		/**/
 
+/* HAS_GETPGID:
+ *	This symbol, if defined, indicates to the C program that 
+ *	the getpgid(pid) function is available to get the
+ *	process group id.
+ */
+#$d_getpgid HAS_GETPGID		/**/
+
+/* HAS_GETPGRP:
+ *	This symbol, if defined, indicates that the getpgrp routine is
+ *	available to get the current process group.
+ */
+/* USE_BSD_GETPGRP:
+ *	This symbol, if defined, indicates that getpgrp needs one
+ *	arguments whereas USG one needs none.
+ */
+#$d_getpgrp HAS_GETPGRP		/**/
+#$d_bsdgetpgrp USE_BSD_GETPGRP	/**/
+
 /* HAS_GETPGRP2:
  *	This symbol, if defined, indicates that the getpgrp2() (as in DG/UX)
  *	routine is available to get the current process group.
@@ -460,11 +337,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$d_htonl HAS_NTOHL		/**/
 #$d_htonl HAS_NTOHS		/**/
 
-/* HAS_ISASCII:
- *	This manifest constant lets the C program know that isascii 
- *	is available.
+/* HAS_INET_ATON:
+ *	This symbol, if defined, indicates to the C program that the
+ *	inet_aton() function is available to parse IP address "dotted-quad"
+ *	strings.
  */
-#$d_isascii HAS_ISASCII		/**/
+#$d_inetaton HAS_INET_ATON		/**/
 
 /* HAS_KILLPG:
  *	This symbol, if defined, indicates that the killpg routine is available
@@ -574,12 +452,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_nice HAS_NICE		/**/
 
-/* HAS_OPEN3:
- *	This manifest constant lets the C program know that the three
- *	argument form of open(2) is available.
- */
-#$d_open3 HAS_OPEN3		/**/
-
 /* HAS_PATHCONF:
  *	This symbol, if defined, indicates that pathconf() is available
  *	to determine file-system related limits and options associated
@@ -607,16 +479,11 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 
 /* HAS_POLL:
  *	This symbol, if defined, indicates that the poll routine is
- *	available to poll active file descriptors.
+ *	available to poll active file descriptors. You may safely
+ *	include <poll.h> when this symbol is defined.
  */
 #$d_poll HAS_POLL		/**/
 
-/* HAS_PTHREAD_YIELD:
- *	This symbol, if defined, indicates that the pthread_yield routine is
- *	available to yield the execution of the current thread.
- */
-#$d_pthread_yield HAS_PTHREAD_YIELD
-
 /* HAS_READDIR:
  *	This symbol, if defined, indicates that the readdir routine is
  *	available to read directory entries. You may have to include
@@ -624,12 +491,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_readdir HAS_READDIR		/**/
 
-/* HAS_SCHED_YIELD:
- *	This symbol, if defined, indicates that the sched_yield
- *	routine is available to yield the execution of the current thread.
- */
-#$d_sched_yield HAS_SCHED_YIELD
-
 /* HAS_SEEKDIR:
  *	This symbol, if defined, indicates that the seekdir routine is
  *	available. You may have to include <dirent.h>. See I_DIRENT.
@@ -668,29 +529,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_rmdir HAS_RMDIR		/**/
 
-/* HAS_SAFE_BCOPY:
- *	This symbol, if defined, indicates that the bcopy routine is available
- *	to copy potentially overlapping memory blocks. Otherwise you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-#$d_safebcpy HAS_SAFE_BCOPY	/**/
-
-/* HAS_SAFE_MEMCPY:
- *	This symbol, if defined, indicates that the memcpy routine is available
- *	to copy potentially overlapping memory blocks. Otherwise you should
- *	probably use memmove() or memcpy(). If neither is defined, roll your
- *	own version.
- */
-#$d_safemcpy HAS_SAFE_MEMCPY	/**/
-
-/* HAS_SANE_MEMCMP:
- *	This symbol, if defined, indicates that the memcmp routine is available
- *	and can be used to compare relative magnitudes of chars with their high
- *	bits set.  If it is not defined, roll your own version.
- */
-#$d_sanemcmp HAS_SANE_MEMCMP	/**/
-
 /* HAS_SELECT:
  *	This symbol, if defined, indicates that the select routine is
  *	available to select active file descriptors. If the timeout field
@@ -729,6 +567,24 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_setlocale HAS_SETLOCALE	/**/
 
+/* HAS_SETPGID:
+ *	This symbol, if defined, indicates that the setpgid(pid, gpid)
+ *	routine is available to set process group ID.
+ */
+#$d_setpgid HAS_SETPGID	/**/
+
+/* HAS_SETPGRP:
+ *	This symbol, if defined, indicates that the setpgrp routine is
+ *	available to set the current process group.
+ */
+/* USE_BSD_SETPGRP:
+ *	This symbol, if defined, indicates that setpgrp needs two
+ *	arguments whereas USG one needs none.  See also HAS_SETPGID
+ *	for a POSIX interface.
+ */
+#$d_setpgrp HAS_SETPGRP		/**/
+#$d_bsdsetpgrp USE_BSD_SETPGRP	/**/
+
 /* HAS_SETPGRP2:
  *	This symbol, if defined, indicates that the setpgrp2() (as in DG/UX)
  *	routine is available to set the current process group.
@@ -805,12 +661,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define Shmat_t $shmattype	/**/
 #$d_shmatprototype HAS_SHMAT_PROTOTYPE	/**/
 
-/* HAS_SIGACTION:
- *	This symbol, if defined, indicates that Vr4's sigaction() routine
- *	is available.
- */
-#$d_sigaction HAS_SIGACTION	/**/
-
 /* HAS_SOCKET:
  *	This symbol, if defined, indicates that the BSD socket interface is
  *	supported.
@@ -828,65 +678,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_statblks USE_STAT_BLOCKS 	/**/
 
-/* USE_STDIO_PTR:
- *	This symbol is defined if the _ptr and _cnt fields (or similar)
- *	of the stdio FILE structure can be used to access the stdio buffer
- *	for a file handle.  If this is defined, then the FILE_ptr(fp)
- *	and FILE_cnt(fp) macros will also be defined and should be used
- *	to access these fields.
- */
-/* FILE_ptr:
- *	This macro is used to access the _ptr field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_PTR_LVALUE:
- *	This symbol is defined if the FILE_ptr macro can be used as an
- *	lvalue.
- */
-/* FILE_cnt:
- *	This macro is used to access the _cnt field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_PTR is defined.
- */
-/* STDIO_CNT_LVALUE:
- *	This symbol is defined if the FILE_cnt macro can be used as an
- *	lvalue.
- */
-#$d_stdstdio USE_STDIO_PTR 	/**/
-#ifdef USE_STDIO_PTR
-#define FILE_ptr(fp)	$stdio_ptr
-#$d_stdio_ptr_lval STDIO_PTR_LVALUE 		/**/
-#define FILE_cnt(fp)	$stdio_cnt
-#$d_stdio_cnt_lval STDIO_CNT_LVALUE 		/**/
-#endif
-
-/* USE_STDIO_BASE:
- *	This symbol is defined if the _base field (or similar) of the
- *	stdio FILE structure can be used to access the stdio buffer for
- *	a file handle.  If this is defined, then the FILE_base(fp) macro
- *	will also be defined and should be used to access this field.
- *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
- *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
- *	will never be defined unless USE_STDIO_PTR is.
- */
-/* FILE_base:
- *	This macro is used to access the _base field (or equivalent) of the
- *	FILE structure pointed to by its argument. This macro will always be
- *	defined if USE_STDIO_BASE is defined.
- */
-/* FILE_bufsiz:
- *	This macro is used to determine the number of bytes in the I/O
- *	buffer pointed to by _base field (or equivalent) of the FILE
- *	structure pointed to its argument. This macro will always be defined
- *	if USE_STDIO_BASE is defined.
- */
-#$d_stdiobase USE_STDIO_BASE 	/**/
-#ifdef USE_STDIO_BASE
-#define FILE_base(fp)	$stdio_base
-#define FILE_bufsiz(fp)	$stdio_bufsiz
-#endif
-
 /* HAS_STRCHR:
  *	This symbol is defined to indicate that the strchr()/strrchr()
  *	functions are available for string searching. If not, try the
@@ -1028,14 +819,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$d_vfork HAS_VFORK	/**/
 
-/* Signal_t:
- *	This symbol's value is either "void" or "int", corresponding to the
- *	appropriate return type of a signal handler.  Thus, you can declare
- *	a signal handler using "Signal_t (*handler)()", and define the
- *	handler using "Signal_t handler(sig)".
- */
-#define Signal_t $signal_t	/* Signal handler's return type */
-
 /* HASVOLATILE:
  *	This symbol, if defined, indicates that this C compiler knows about
  *	the volatile declaration.
@@ -1045,20 +828,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define volatile
 #endif
 
-/* HAS_VPRINTF:
- *	This symbol, if defined, indicates that the vprintf routine is available
- *	to printf with a pointer to an argument list.  If unavailable, you
- *	may need to write your own, probably in terms of _doprnt().
- */
-/* USE_CHAR_VSPRINTF:
- *	This symbol is defined if this system has vsprintf() returning type
- *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
- *	is up to the package author to declare vsprintf correctly based on the
- *	symbol.
- */
-#$d_vprintf HAS_VPRINTF	/**/
-#$d_charvspr USE_CHAR_VSPRINTF 	/**/
-
 /* HAS_WAIT4:
  *	This symbol, if defined, indicates that wait4() exists.
  */
@@ -1098,30 +867,16 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Gid_t $gidtype		/* Type for getgid(), etc... */
 
-/* Groups_t:
- *	This symbol holds the type used for the second argument to
- *	[gs]etgroups().  Usually, this is the same of gidtype, but
- *	sometimes it isn't.  It can be int, ushort, uid_t, etc... 
- *	It may be necessary to include <sys/types.h> to get any 
- *	typedef'ed information.  This is only required if you have
- *	getgroups() or setgroups().
- */
-#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS)
-#define Groups_t $groupstype	/* Type for 2nd arg to [gs]etgroups() */
-#endif
-
-/* DB_Prefix_t:
- *	This symbol contains the type of the prefix structure element
- *	in the <db.h> header file.  In older versions of DB, it was
- *	int, while in newer ones it is u_int32_t.
+/* I_DBM:
+ *	This symbol, if defined, indicates that <dbm.h> exists and should
+ *	be included.
  */
-/* DB_Hash_t:
- *	This symbol contains the type of the prefix structure element
- *	in the <db.h> header file.  In older versions of DB, it was
- *	int, while in newer ones it is size_t.
+/* I_RPCSVC_DBM:
+ *	This symbol, if defined, indicates that <rpcsvc/dbm.h> exists and
+ *	should be included.
  */
-#define DB_Hash_t	$db_hashtype		/**/
-#define DB_Prefix_t	$db_prefixtype  	/**/
+#$i_dbm I_DBM	/**/
+#$i_rpcsvcdbm I_RPCSVC_DBM	/**/
 
 /* I_DIRENT:
  *	This symbol, if defined, indicates to the C program that it should
@@ -1174,6 +929,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_limits I_LIMITS		/**/
 
+/* I_LOCALE:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <locale.h>.
+ */
+#$i_locale	I_LOCALE		/**/
+
 /* I_MATH:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <math.h>.
@@ -1204,12 +965,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_niin I_NETINET_IN	/**/
 
-/* I_NETDB:
- *	This symbol, if defined, indicates that <netdb.h> exists and 
- *	should be included.
- */
-#$i_netdb I_NETDB		/**/
-
 /* I_PWD:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <pwd.h>.
@@ -1246,6 +1001,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$d_pwexpire PWEXPIRE	/**/
 #$d_pwcomment PWCOMMENT	/**/
 
+/* I_SFIO:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sfio.h>.
+ */
+#$i_sfio	I_SFIO		/**/
+
 /* I_STDDEF:
  *	This symbol, if defined, indicates that <stddef.h> exists and should
  *	be included.
@@ -1306,6 +1067,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_sysselct I_SYS_SELECT	/**/
 
+/* I_SYS_STAT:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <sys/stat.h>.
+ */
+#$i_sysstat	I_SYS_STAT		/**/
+
 /* I_SYS_TIMES:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <sys/times.h>.
@@ -1350,22 +1117,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #$i_termios I_TERMIOS		/**/
 #$i_sgtty I_SGTTY		/**/
 
-/* I_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <time.h>.
- */
-/* I_SYS_TIME:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h>.
- */
-/* I_SYS_TIME_KERNEL:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/time.h> with KERNEL defined.
- */
-#$i_time I_TIME		/**/
-#$i_systime I_SYS_TIME		/**/
-#$i_systimek I_SYS_TIME_KERNEL		/**/
-
 /* I_UNISTD:
  *	This symbol, if defined, indicates to the C program that it should
  *	include <unistd.h>.
@@ -1378,6 +1129,14 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_utime I_UTIME		/**/
 
+/* I_VALUES:
+ *	This symbol, if defined, indicates to the C program that it should
+ *	include <values.h> to get definition of symbols like MINFLOAT or
+ *	MAXLONG, i.e. machine dependant limitations.  Probably, you
+ *	should use <limits.h> instead, if it is available.
+ */
+#$i_values I_VALUES		/**/
+
 /* I_STDARG:
  *	This symbol, if defined, indicates that <stdarg.h> exists and should
  *	be included.
@@ -1395,22 +1154,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_vfork I_VFORK	/**/
 
-/* INTSIZE:
- *	This symbol contains the value of sizeof(int) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* LONGSIZE:
- *	This symbol contains the value of sizeof(long) so that the C
- *	preprocessor can make decisions based on it.
- */
-/* SHORTSIZE:
- *	This symbol contains the value of sizeof(short) so that the C
- *	preprocessor can make decisions based on it.
- */
-#define INTSIZE $intsize		/**/
-#define LONGSIZE $longsize		/**/
-#define SHORTSIZE $shortsize		/**/
-
 /* Off_t:
  *	This symbol holds the type used to declare offsets in the kernel.
  *	It can be int, long, off_t, etc... It may be necessary to include
@@ -1418,6 +1161,21 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Off_t $lseektype		/* <offset> type */
 
+/* Free_t:
+ *	This variable contains the return type of free().  It is usually
+ * void, but occasionally int.
+ */
+/* Malloc_t:
+ *	This symbol is the type of pointer returned by malloc and realloc.
+ */
+#define Malloc_t $malloctype			/**/
+#define Free_t $freetype			/**/
+
+/* MYMALLOC:
+ *	This symbol, if defined, indicates that we're using our own malloc.
+ */
+#$d_mymalloc MYMALLOC			/**/
+
 /* Mode_t:
  *	This symbol holds the type used to declare file modes 
  *	for systems calls.  It is usually mode_t, but may be
@@ -1426,32 +1184,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Mode_t $modetype	 /* file mode parameter for system calls */
 
-/* VAL_O_NONBLOCK:
- *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
- *	non-blocking I/O for the file descriptor. Note that there is no way
- *	back, i.e. you cannot turn it blocking again this way. If you wish to
- *	alternatively switch between blocking and non-blocking, use the
- *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
- */
-/* VAL_EAGAIN:
- *	This symbol holds the errno error code set by read() when no data was
- *	present on the non-blocking file descriptor.
- */
-/* RD_NODATA:
- *	This symbol holds the return code from read() when no data is present
- *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
- *	not defined, then you can't distinguish between no data and EOF by
- *	issuing a read(). You'll have to find another way to tell for sure!
- */
-/* EOF_NONBLOCK:
- *	This symbol, if defined, indicates to the C program that a read() on
- *	a non-blocking file descriptor will return 0 on EOF, and not the value
- *	held in RD_NODATA (-1 usually, in that case!).
+/* Pid_t:
+ *	This symbol holds the type used to declare process ids in the kernel.
+ *	It can be int, uint, pid_t, etc... It may be necessary to include
+ *	<sys/types.h> to get any typedef'ed information.
  */
-#define VAL_O_NONBLOCK $o_nonblock
-#define VAL_EAGAIN $eagain
-#define RD_NODATA $rd_nodata
-#$d_eofnblk EOF_NONBLOCK
+#define Pid_t $pidtype		/* PID type */
 
 /* CAN_PROTOTYPE:
  *	If defined, this macro indicates that the C compiler can handle
@@ -1471,19 +1209,14 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define	_(args) ()
 #endif
 
-/* RANDBITS:
- *	This symbol contains the number of bits of random number the rand()
- *	function produces.  Usual values are 15, 16, and 31.
- */
-#define RANDBITS $randbits		/**/
-
-/* Select_fd_set_t:
- *	This symbol holds the type used for the 2nd, 3rd, and 4th
- *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
- *	is defined, and 'int *' otherwise.  This is only useful if you 
- *	have select(), of course.
+/* SH_PATH:
+ *	This symbol contains the full pathname to the shell used on this
+ *	on this system to execute Bourne shell scripts.  Usually, this will be
+ *	/bin/sh, though it's possible that some systems will have /bin/ksh,
+ *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
+ *	D:/bin/sh.exe.
  */
-#define Select_fd_set_t 	$selecttype	/**/
+#define SH_PATH "$sh"  /**/
 
 /* Size_t:
  *	This symbol holds the type used to declare length parameters
@@ -1493,16 +1226,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Size_t $sizetype	 /* length paramater for string functions */
 
-/* SSize_t:
- *	This symbol holds the type used by functions that return
- *	a count of bytes or an error condition.  It must be a signed type.
- *	It is usually ssize_t, but may be long or int, etc.
- *	It may be necessary to include <sys/types.h> or <unistd.h>
- *	to get any typedef'ed information.
- *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
- */
-#define SSize_t $ssizetype	 /* signed count of bytes */
-
 /* STDCHAR:
  *	This symbol is defined to be the type of char used in stdio.h.
  *	It has the values "unsigned char" or "char".
@@ -1516,39 +1239,41 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Uid_t $uidtype		/* UID type */
 
-/* LOC_SED:
- *	This symbol holds the complete pathname to the sed program.
- */
-#define LOC_SED 	"$full_sed"	/**/
-
-/* OSNAME:
- *	This symbol contains the name of the operating system, as determined
- *	by Configure.  You shouldn't rely on it too much; the specific
- *	feature tests from Configure are generally more reliable.
- */
-#define OSNAME "$osname"		/**/
-
-/* ARCHLIB:
- *	This variable, if defined, holds the name of the directory in
- *	which the user wants to put architecture-dependent public
- *	library files for $package.  It is most often a local directory
- *	such as /usr/local/lib.  Programs using this variable must be
- *	prepared to deal with filename expansion.  If ARCHLIB is the
- *	same as PRIVLIB, it is not defined, since presumably the
- *	program already searches PRIVLIB.
- */
-/* ARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of ARCHLIB, to be used
- *	in programs that are not prepared to deal with ~ expansion at run-time.
+/* VOIDFLAGS:
+ *	This symbol indicates how much support of the void type is given by this
+ *	compiler.  What various bits mean:
+ *
+ *	    1 = supports declaration of void
+ *	    2 = supports arrays of pointers to functions returning void
+ *	    4 = supports comparisons between pointers to void functions and
+ *		    addresses of void functions
+ *	    8 = suports declaration of generic void pointers
+ *
+ *	The package designer should define VOIDUSED to indicate the requirements
+ *	of the package.  This can be done either by #defining VOIDUSED before
+ *	including config.h, or by defining defvoidused in Myinit.U.  If the
+ *	latter approach is taken, only those flags will be tested.  If the
+ *	level of void support necessary is not present, defines void to int.
  */
-#$d_archlib ARCHLIB "$archlib"		/**/
-#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
+#ifndef VOIDUSED
+#define VOIDUSED $defvoidused
+#endif
+#define VOIDFLAGS $voidflags
+#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
+#define void int		/* is void to be avoided? */
+#define M_VOID			/* Xenix strikes again */
+#endif
 
-/* BINCOMPAT3:
- *	This symbol, if defined, indicates that Perl 5.004 should be
- *	binary-compatible with Perl 5.003.
+/* MEM_ALIGNBYTES:
+ *	 This symbol contains the number of bytes required to align a
+ *	 double. Usual values are 2, 4 and 8.
+ *	 On NeXT starting with 3.2, you can build "Fat" Multiple Architecture
+ *	 Binaries (MAB) for targets with varying alignment.  This only matters
+ *	 for perl, where the config.h can be generated and installed on one
+ *	 system, and used by a different architecture to build an extension.
+ *	 The default is eight, for safety.
  */
-#$d_bincompat3 BINCOMPAT3			/**/
+#define MEM_ALIGNBYTES $alignbytes	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -1573,39 +1298,32 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #endif /* ENDIAN CHECK */
 #endif /* NeXT */
 
-/* CSH:
- *	This symbol, if defined, indicates that the C-shell exists.
- *	If defined, contains the full pathname of csh.
+/* CASTI32:
+ *	This symbol is defined if the C compiler can cast negative
+ *	or large floating point numbers to 32-bit ints.
  */
-#$d_csh CSH "$full_csh"		/**/
+#$d_casti32	CASTI32		/**/
 
-/* DLSYM_NEEDS_UNDERSCORE:
- *	This symbol, if defined, indicates that we need to prepend an
- *	underscore to the symbol name before calling dlsym().  This only
- *	makes sense if you *have* dlsym, which we will presume is the
- *	case if you're using dl_dlopen.xs.
+/* CASTNEGFLOAT:
+ *	This symbol is defined if the C compiler can cast negative
+ *	numbers to unsigned longs, ints and shorts.
  */
-#$d_dlsymun 	DLSYM_NEEDS_UNDERSCORE 	/**/
-
-/* SETUID_SCRIPTS_ARE_SECURE_NOW:
- *	This symbol, if defined, indicates that the bug that prevents
- *	setuid scripts from being secure is not present in this kernel.
+/* CASTFLAGS:
+ *	This symbol contains flags that say what difficulties the compiler
+ *	has casting odd floating values to unsigned long:
+ *		0 = ok
+ *		1 = couldn't cast < 0
+ *		2 = couldn't cast >= 0x80000000
+ *		4 = couldn't cast in argument expression list
  */
-/* DOSUID:
- *	This symbol, if defined, indicates that the C program should
- *	check the script that it is executing for setuid/setgid bits, and
- *	attempt to emulate setuid/setgid on systems that have disabled
- *	setuid #! scripts because the kernel can't do it securely.
- *	It is up to the package designer to make sure that this emulation
- *	is done securely.  Among other things, it should do an fstat on
- *	the script it just opened to make sure it really is a setuid/setgid
- *	script, it should make sure the arguments passed correspond exactly
- *	to the argument on the #! line, and it should not trust any
- *	subprocesses to which it must pass the filename rather than the
- *	file descriptor of the script to be executed.
+#$d_castneg	CASTNEGFLOAT		/**/
+#define CASTFLAGS $castflags		/**/
+
+/* VOID_CLOSEDIR:
+ *	This symbol, if defined, indicates that the closedir() routine
+ *	does not return a value.
  */
-#$d_suidsafe SETUID_SCRIPTS_ARE_SECURE_NOW	/**/
-#$d_dosuid DOSUID		/**/
+#$d_void_closedir VOID_CLOSEDIR		/**/
 
 /* Gconvert:
  *	This preprocessor macro is defined to convert a floating point
@@ -1624,68 +1342,51 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #define Gconvert(x,n,t,b) $d_Gconvert
 
-/* HAS_GETPGID:
+/* HAS_GNULIBC:
  *	This symbol, if defined, indicates to the C program that 
- *	the getpgid(pid) function is available to get the
- *	process group id.
- */
-#$d_getpgid HAS_GETPGID		/**/
-
-/* HAS_GETPGRP:
- *	This symbol, if defined, indicates that the getpgrp routine is
- *	available to get the current process group.
+ *	the GNU C library is being used.
  */
-/* USE_BSD_GETPGRP:
- *	This symbol, if defined, indicates that getpgrp needs one
- *	arguments whereas USG one needs none.
+#$d_gnulibc HAS_GNULIBC  	/**/
+/* HAS_ISASCII:
+ *	This manifest constant lets the C program know that isascii 
+ *	is available.
  */
-#$d_getpgrp HAS_GETPGRP		/**/
-#$d_bsdgetpgrp USE_BSD_GETPGRP	/**/
+#$d_isascii HAS_ISASCII		/**/
 
-/* HAS_INET_ATON:
- *	This symbol, if defined, indicates to the C program that the
- *	inet_aton() function is available to parse IP address "dotted-quad"
- *	strings.
+/* HAS_OPEN3:
+ *	This manifest constant lets the C program know that the three
+ *	argument form of open(2) is available.
  */
-#$d_inetaton HAS_INET_ATON		/**/
+#$d_open3 HAS_OPEN3		/**/
 
-/* HAS_SETPGID:
- *	This symbol, if defined, indicates to the C program that 
- *	the setpgid(pid, gpid) function is available to set the
- *	process group id.
+/* HAS_SAFE_BCOPY:
+ *	This symbol, if defined, indicates that the bcopy routine is available
+ *	to copy potentially overlapping memory blocks. Otherwise you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
  */
-#$d_setpgid HAS_SETPGID		/**/
+#$d_safebcpy HAS_SAFE_BCOPY	/**/
 
-/* HAS_SETPGRP:
- *	This symbol, if defined, indicates that the setpgrp routine is
- *	available to set the current process group.
- */
-/* USE_BSD_SETPGRP:
- *	This symbol, if defined, indicates that setpgrp needs two
- *	arguments whereas USG one needs none.  See also HAS_SETPGID
- *	for a POSIX interface.
- */
-/* USE_BSDPGRP:
- *	This symbol, if defined, indicates that the BSD notion of process
- *	group is to be used. For instance, you have to say setpgrp(pid, pgrp)
- *	instead of the USG setpgrp().  This should be obsolete since
- *	there are systems which have BSD-ish setpgrp but USG-ish getpgrp.
+/* HAS_SAFE_MEMCPY:
+ *	This symbol, if defined, indicates that the memcpy routine is available
+ *	to copy potentially overlapping memory blocks. Otherwise you should
+ *	probably use memmove() or memcpy(). If neither is defined, roll your
+ *	own version.
  */
-#$d_setpgrp HAS_SETPGRP		/**/
-#$d_bsdsetpgrp USE_BSD_SETPGRP	/**/
-#$d_bsdpgrp USE_BSDPGRP		/**/
+#$d_safemcpy HAS_SAFE_MEMCPY	/**/
 
-/* USE_SFIO:
- *	This symbol, if defined, indicates that sfio should
- *	be used.
+/* HAS_SANE_MEMCMP:
+ *	This symbol, if defined, indicates that the memcmp routine is available
+ *	and can be used to compare relative magnitudes of chars with their high
+ *	bits set.  If it is not defined, roll your own version.
  */
-#$d_sfio	USE_SFIO		/**/
+#$d_sanemcmp HAS_SANE_MEMCMP	/**/
 
-/* PTHREADS_CREATED_JOINABLE:
- *	This symbol, if defined, indicates that pthreads are created
- *	in the joinable (aka undetached) state.
+/* HAS_SIGACTION:
+ *	This symbol, if defined, indicates that Vr4's sigaction() routine
+ *	is available.
  */
-#$d_pthreads_created_joinable	PTHREADS_CREATED_JOINABLE		/**/
+#$d_sigaction HAS_SIGACTION	/**/
 
 /* Sigjmp_buf:
  *	This is the buffer type to be used with Sigsetjmp and Siglongjmp.
@@ -1711,78 +1412,236 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define Siglongjmp(buf,retval) longjmp((buf),(retval))
 #endif
 
-/* USE_DYNAMIC_LOADING:
- *	This symbol, if defined, indicates that dynamic loading of
- *	some sort is available.
+/* USE_STDIO_PTR:
+ *	This symbol is defined if the _ptr and _cnt fields (or similar)
+ *	of the stdio FILE structure can be used to access the stdio buffer
+ *	for a file handle.  If this is defined, then the FILE_ptr(fp)
+ *	and FILE_cnt(fp) macros will also be defined and should be used
+ *	to access these fields.
  */
-#$usedl USE_DYNAMIC_LOADING		/**/
+/* FILE_ptr:
+ *	This macro is used to access the _ptr field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_PTR_LVALUE:
+ *	This symbol is defined if the FILE_ptr macro can be used as an
+ *	lvalue.
+ */
+/* FILE_cnt:
+ *	This macro is used to access the _cnt field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_PTR is defined.
+ */
+/* STDIO_CNT_LVALUE:
+ *	This symbol is defined if the FILE_cnt macro can be used as an
+ *	lvalue.
+ */
+#$d_stdstdio USE_STDIO_PTR 	/**/
+#ifdef USE_STDIO_PTR
+#define FILE_ptr(fp)	$stdio_ptr
+#$d_stdio_ptr_lval STDIO_PTR_LVALUE 		/**/
+#define FILE_cnt(fp)	$stdio_cnt
+#$d_stdio_cnt_lval STDIO_CNT_LVALUE 		/**/
+#endif
 
-/* I_DBM:
- *	This symbol, if defined, indicates that <dbm.h> exists and should
- *	be included.
+/* USE_STDIO_BASE:
+ *	This symbol is defined if the _base field (or similar) of the
+ *	stdio FILE structure can be used to access the stdio buffer for
+ *	a file handle.  If this is defined, then the FILE_base(fp) macro
+ *	will also be defined and should be used to access this field.
+ *	Also, the FILE_bufsiz(fp) macro will be defined and should be used
+ *	to determine the number of bytes in the buffer.  USE_STDIO_BASE
+ *	will never be defined unless USE_STDIO_PTR is.
  */
-/* I_RPCSVC_DBM:
- *	This symbol, if defined, indicates that <rpcsvc/dbm.h> exists and
- *	should be included.
+/* FILE_base:
+ *	This macro is used to access the _base field (or equivalent) of the
+ *	FILE structure pointed to by its argument. This macro will always be
+ *	defined if USE_STDIO_BASE is defined.
  */
-#$i_dbm I_DBM	/**/
-#$i_rpcsvcdbm I_RPCSVC_DBM	/**/
+/* FILE_bufsiz:
+ *	This macro is used to determine the number of bytes in the I/O
+ *	buffer pointed to by _base field (or equivalent) of the FILE
+ *	structure pointed to its argument. This macro will always be defined
+ *	if USE_STDIO_BASE is defined.
+ */
+#$d_stdiobase USE_STDIO_BASE 	/**/
+#ifdef USE_STDIO_BASE
+#define FILE_base(fp)	$stdio_base
+#define FILE_bufsiz(fp)	$stdio_bufsiz
+#endif
 
-/* I_LOCALE:
- *	This symbol, if defined, indicates to the C program that it should
- *	include <locale.h>.
+/* HAS_VPRINTF:
+ *	This symbol, if defined, indicates that the vprintf routine is available
+ *	to printf with a pointer to an argument list.  If unavailable, you
+ *	may need to write your own, probably in terms of _doprnt().
  */
-#$i_locale	I_LOCALE		/**/
+/* USE_CHAR_VSPRINTF:
+ *	This symbol is defined if this system has vsprintf() returning type
+ *	(char*).  The trend seems to be to declare it as "int vsprintf()".  It
+ *	is up to the package author to declare vsprintf correctly based on the
+ *	symbol.
+ */
+#$d_vprintf HAS_VPRINTF	/**/
+#$d_charvspr USE_CHAR_VSPRINTF 	/**/
 
-/* I_SFIO:
+/* I_TIME:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <sfio.h>.
+ *	include <time.h>.
  */
-#$i_sfio	I_SFIO		/**/
-
-/* I_SYS_STAT:
+/* I_SYS_TIME:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <sys/stat.h>.
+ *	include <sys/time.h>.
  */
-#$i_sysstat	I_SYS_STAT		/**/
-
-/* I_VALUES:
+/* I_SYS_TIME_KERNEL:
  *	This symbol, if defined, indicates to the C program that it should
- *	include <values.h> to get definition of symbols like MINFLOAT or
- *	MAXLONG, i.e. machine dependant limitations.  Probably, you
- *	should use <limits.h> instead, if it is available.
+ *	include <sys/time.h> with KERNEL defined.
  */
-#$i_values I_VALUES		/**/
+#$i_time I_TIME		/**/
+#$i_systime I_SYS_TIME		/**/
+#$i_systimek I_SYS_TIME_KERNEL		/**/
 
-/* Free_t:
- *	This variable contains the return type of free().  It is usually
- * void, but occasionally int.
+/* INTSIZE:
+ *	This symbol contains the value of sizeof(int) so that the C
+ *	preprocessor can make decisions based on it.
  */
-/* Malloc_t:
- *	This symbol is the type of pointer returned by malloc and realloc.
+/* LONGSIZE:
+ *	This symbol contains the value of sizeof(long) so that the C
+ *	preprocessor can make decisions based on it.
  */
-#define Malloc_t $malloctype			/**/
-#define Free_t $freetype			/**/
+/* SHORTSIZE:
+ *	This symbol contains the value of sizeof(short) so that the C
+ *	preprocessor can make decisions based on it.
+ */
+#define INTSIZE $intsize		/**/
+#define LONGSIZE $longsize		/**/
+#define SHORTSIZE $shortsize		/**/
 
-/* MYMALLOC:
- *	This symbol, if defined, indicates that we're using our own malloc.
+/* VAL_O_NONBLOCK:
+ *	This symbol is to be used during open() or fcntl(F_SETFL) to turn on
+ *	non-blocking I/O for the file descriptor. Note that there is no way
+ *	back, i.e. you cannot turn it blocking again this way. If you wish to
+ *	alternatively switch between blocking and non-blocking, use the
+ *	ioctl(FIOSNBIO) call instead, but that is not supported by all devices.
  */
-#$d_mymalloc MYMALLOC			/**/
+/* VAL_EAGAIN:
+ *	This symbol holds the errno error code set by read() when no data was
+ *	present on the non-blocking file descriptor.
+ */
+/* RD_NODATA:
+ *	This symbol holds the return code from read() when no data is present
+ *	on the non-blocking file descriptor. Be careful! If EOF_NONBLOCK is
+ *	not defined, then you can't distinguish between no data and EOF by
+ *	issuing a read(). You'll have to find another way to tell for sure!
+ */
+/* EOF_NONBLOCK:
+ *	This symbol, if defined, indicates to the C program that a read() on
+ *	a non-blocking file descriptor will return 0 on EOF, and not the value
+ *	held in RD_NODATA (-1 usually, in that case!).
+ */
+#define VAL_O_NONBLOCK $o_nonblock
+#define VAL_EAGAIN $eagain
+#define RD_NODATA $rd_nodata
+#$d_eofnblk EOF_NONBLOCK
+
+/* RANDBITS:
+ *	This symbol contains the number of bits of random number the rand()
+ *	function produces.  Usual values are 15, 16, and 31.
+ */
+#define RANDBITS $randbits		/**/
+
+/* SSize_t:
+ *	This symbol holds the type used by functions that return
+ *	a count of bytes or an error condition.  It must be a signed type.
+ *	It is usually ssize_t, but may be long or int, etc.
+ *	It may be necessary to include <sys/types.h> or <unistd.h>
+ *	to get any typedef'ed information.
+ *	We will pick a type such that sizeof(SSize_t) == sizeof(Size_t).
+ */
+#define SSize_t $ssizetype	 /* signed count of bytes */
 
-/* OLDARCHLIB:
+/* OSNAME:
+ *	This symbol contains the name of the operating system, as determined
+ *	by Configure.  You shouldn't rely on it too much; the specific
+ *	feature tests from Configure are generally more reliable.
+ */
+#define OSNAME "$osname"		/**/
+
+/* ARCHLIB:
  *	This variable, if defined, holds the name of the directory in
- *	which the user has perl5.000 or perl5.001 architecture-dependent
- *	public library files for $package.  For the most part, these
- *	files will work with 5.002 (and later), but that is not
- *	guaranteed.
+ *	which the user wants to put architecture-dependent public
+ *	library files for $package.  It is most often a local directory
+ *	such as /usr/local/lib.  Programs using this variable must be
+ *	prepared to deal with filename expansion.  If ARCHLIB is the
+ *	same as PRIVLIB, it is not defined, since presumably the
+ *	program already searches PRIVLIB.
+ */
+/* ARCHLIB_EXP:
+ *	This symbol contains the ~name expanded version of ARCHLIB, to be used
+ *	in programs that are not prepared to deal with ~ expansion at run-time.
+ */
+#$d_archlib ARCHLIB "$archlib"		/**/
+#$d_archlib ARCHLIB_EXP "$archlibexp"		/**/
+
+/* CAT2:
+ *	This macro catenates 2 tokens together.
+ */
+/* STRINGIFY:
+ *	This macro surrounds its token with double quotes.
+ */
+#if $cpp_stuff == 1
+#define CAT2(a,b)a/**/b
+#define STRINGIFY(a)"a"
+		/* If you can get stringification with catify, tell me how! */
+#endif
+#if $cpp_stuff == 42
+#define CAT2(a,b)a ## b
+#define StGiFy(a)# a
+#define STRINGIFY(a)StGiFy(a)
+#endif
+#if $cpp_stuff != 1 && $cpp_stuff != 42
+#include "Bletch: How does this C preprocessor catenate tokens?"
+#endif
+
+/* CSH:
+ *	This symbol, if defined, indicates that the C-shell exists.
+ *	If defined, contains the full pathname of csh.
  */
-/* OLDARCHLIB_EXP:
- *	This symbol contains the ~name expanded version of OLDARCHLIB, to be
- *	used in programs that are not prepared to deal with ~ expansion at 
- *	run-time.
+#$d_csh CSH "$full_csh"		/**/
+
+/* HAS_SETGROUPS:
+ *	This symbol, if defined, indicates that the setgroups() routine is
+ *	available to set the list of process groups.  If unavailable, multiple
+ *	groups are probably not supported.
  */
-#$d_oldarchlib OLDARCHLIB "$oldarchlib"		/**/
-#$d_oldarchlib OLDARCHLIB_EXP "$oldarchlibexp"		/**/
+#$d_setgrps HAS_SETGROUPS		/**/
+
+/* Signal_t:
+ *	This symbol's value is either "void" or "int", corresponding to the
+ *	appropriate return type of a signal handler.  Thus, you can declare
+ *	a signal handler using "Signal_t (*handler)()", and define the
+ *	handler using "Signal_t handler(sig)".
+ */
+#define Signal_t $signal_t	/* Signal handler's return type */
+
+/* Groups_t:
+ *	This symbol holds the type used for the second argument to
+ *	getgroups() and setgropus().  Usually, this is the same as
+ *	gidtype (gid_t) , but sometimes it isn't.
+ *	It can be int, ushort, uid_t, etc... 
+ *	It may be necessary to include <sys/types.h> to get any 
+ *	typedef'ed information.  This is only required if you have
+ *	getgroups() or setgropus()..
+ */
+#if defined(HAS_GETGROUPS) || defined(HAS_SETGROUPS)
+#define Groups_t $groupstype	/* Type for 2nd arg to [sg]etgroups() */
+#endif
+
+/* I_NETDB:
+ *	This symbol, if defined, indicates that <netdb.h> exists and
+ *	should be included.
+ */
+#$i_netdb I_NETDB		/**/
 
 /* PRIVLIB:
  *	This symbol contains the name of the private library for this package.
@@ -1797,15 +1656,6 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define PRIVLIB "$privlib"		/**/
 #define PRIVLIB_EXP "$privlibexp"		/**/
 
-/* SH_PATH:
- *	This symbol contains the full pathname to the shell used on this
- *	on this system to execute Bourne shell scripts.  Usually, this will be
- *	/bin/sh, though it's possible that some systems will have /bin/ksh,
- *	/bin/pdksh, /bin/ash, /bin/bash, or even something such as
- *	D:/bin/sh.exe.
- */
-#define SH_PATH "$sh"  /**/
-
 /* SIG_NAME:
  *	This symbol contains a list of signal names in order of
  *	signal number. This is intended
@@ -1834,8 +1684,8 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  *	The last element is 0, corresponding to the 0 at the end of
  *	the sig_name list.
  */
-#define SIG_NAME "`echo $sig_name | sed 's/ /","/g'`",0	/**/
-#define SIG_NUM `echo $sig_num 0 | sed 's/ /,/g'`	/**/
+#define SIG_NAME $sig_name_init		/**/
+#define SIG_NUM  $sig_num			/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1869,6 +1719,39 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
 #define SITELIB "$sitelib"		/**/
 #define SITELIB_EXP "$sitelibexp"		/**/
 
+/* DLSYM_NEEDS_UNDERSCORE:
+ *	This symbol, if defined, indicates that we need to prepend an
+ *	underscore to the symbol name before calling dlsym().  This only
+ *	makes sense if you *have* dlsym, which we will presume is the
+ *	case if you're using dl_dlopen.xs.
+ */
+#$d_dlsymun 	DLSYM_NEEDS_UNDERSCORE 	/**/
+
+/* USE_SFIO:
+ *	This symbol, if defined, indicates that sfio should
+ *	be used.
+ */
+#$d_sfio	USE_SFIO		/**/
+
+/* USE_DYNAMIC_LOADING:
+ *	This symbol, if defined, indicates that dynamic loading of
+ *	some sort is available.
+ */
+#$usedl USE_DYNAMIC_LOADING		/**/
+
+/* DB_Prefix_t:
+ *	This symbol contains the type of the prefix structure element
+ *	in the <db.h> header file.  In older versions of DB, it was
+ *	int, while in newer ones it is u_int32_t.
+ */
+/* DB_Hash_t:
+ *	This symbol contains the type of the prefix structure element
+ *	in the <db.h> header file.  In older versions of DB, it was
+ *	int, while in newer ones it is size_t.
+ */
+#define DB_Hash_t	$db_hashtype		/**/
+#define DB_Prefix_t	$db_prefixtype  	/**/
+
 /* STARTPERL:
  *	This variable contains the string to put in front of a perl
  *	script to make sure (one hopes) that it runs with perl and not
@@ -1883,30 +1766,61 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$useperlio	USE_PERLIO		/**/
 
-/* VOIDFLAGS:
- *	This symbol indicates how much support of the void type is given by this
- *	compiler.  What various bits mean:
- *
- *	    1 = supports declaration of void
- *	    2 = supports arrays of pointers to functions returning void
- *	    4 = supports comparisons between pointers to void functions and
- *		    addresses of void functions
- *	    8 = suports declaration of generic void pointers
- *
- *	The package designer should define VOIDUSED to indicate the requirements
- *	of the package.  This can be done either by #defining VOIDUSED before
- *	including config.h, or by defining defvoidused in Myinit.U.  If the
- *	latter approach is taken, only those flags will be tested.  If the
- *	level of void support necessary is not present, defines void to int.
+/* Netdb_host_t:
+ *	This symbol holds the type used for the 1st argument
+ *	to gethostbyaddr().
  */
-#ifndef VOIDUSED
-#define VOIDUSED $defvoidused
-#endif
-#define VOIDFLAGS $voidflags
-#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
-#define void int		/* is void to be avoided? */
-#define M_VOID			/* Xenix strikes again */
-#endif
+/* Netdb_hlen_t:
+ *	This symbol holds the type used for the 2nd argument
+ *	to gethostbyaddr().
+ */
+/* Netdb_name_t:
+ *	This symbol holds the type used for the argument to
+ *	gethostbyname().
+ */
+/* Netdb_net_t:
+ *	This symbol holds the type used for the 1st argument to
+ *	getnetbyaddr().
+ */
+#define Netdb_host_t		$netdb_host_type /**/
+#define Netdb_hlen_t		$netdb_hlen_type /**/
+#define Netdb_name_t		$netdb_name_type /**/
+#define Netdb_net_t		$netdb_net_type /**/
+
+/* Select_fd_set_t:
+ *	This symbol holds the type used for the 2nd, 3rd, and 4th
+ *	arguments to select.  Usually, this is 'fd_set *', if HAS_FD_SET
+ *	is defined, and 'int *' otherwise.  This is only useful if you 
+ *	have select(), of course.
+ */
+#define Select_fd_set_t 	$selecttype	/**/
+
+/* ARCHNAME:
+ *	This symbol holds a string representing the architecture name.
+ *	It may be used to construct an architecture-dependant pathname
+ *	where library files may be held under a private library, for
+ *	instance.
+ */
+#define ARCHNAME "$archname"		/**/
+
+/* HAS_PTHREAD_YIELD:
+ *	This symbol, if defined, indicates that the pthread_yield 
+ *	routine is available to yield the execution of the current
+ *	thread.
+ */
+#$d_pthread_yield HAS_PTHREAD_YIELD	/**/
+
+/* PTHREADS_CREATED_JOINABLE:
+ *	This symbol, if defined, indicates that pthreads are created
+ *	in the joinable (aka undetached) state.
+ */
+#$d_pthreads_created_joinable PTHREADS_CREATED_JOINABLE /**/
+
+/* USE_THREADS:
+ *	This symbol, if defined, indicates that Perl should
+ *	be built to use threads.
+ */
+#$usethreads	USE_THREADS		/**/
 
 #endif
 !GROK!THIS!
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs
index d3714557ec..31439b2365 100644
--- a/ext/POSIX/POSIX.xs
+++ b/ext/POSIX/POSIX.xs
@@ -247,6 +247,12 @@ char *tzname[] = { "" , "" };
  * support is added and NETaa14816 is considered in full.
  * It does not address tzname aspects of NETaa14816.
  */
+#ifdef HAS_GNULIBC
+# ifndef STRUCT_TM_HASZONE
+#    define STRUCT_TM_HAS_ZONE
+# endif
+#endif
+
 #ifdef STRUCT_TM_HASZONE
 static void
 init_tm(ptm)		/* see mktime, strftime and asctime	*/
diff --git a/hints/aix.sh b/hints/aix.sh
index 569a292870..076eed5769 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -78,8 +78,7 @@ lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).
 esac
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-DUSE_THREADS -DNEED_PTHREAD_INIT $ccflags"
-    cppflags="-DUSE_THREADS -DNEED_PTHREAD_INIT $cppflags"
+    ccflags="-DNEED_PTHREAD_INIT $ccflags"
     case "$cc" in
     xlc_r | cc_r)
 	;;
diff --git a/hints/amigaos.sh b/hints/amigaos.sh
index e768643691..9d86e52bc0 100644
--- a/hints/amigaos.sh
+++ b/hints/amigaos.sh
@@ -42,10 +42,6 @@ lddlflags='-oformat a.out-amiga -r'
 # ccflags='-DAMIGAOS -mstackextend -m68020 -resident32'
 # ldflags='-m68020 -resident32'
 
-# Avoid telldir prototype conflict in pp_sys.c  (AmigaOS uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 # AmigaOS always reports only two links to directories, even if they
 # contain subdirectories.  Consequently, we use this variable to stop
 # File::Find using the link count to determine whether there are
diff --git a/hints/bsdos.sh b/hints/bsdos.sh
index 7c7c6e9565..c89a0a9833 100644
--- a/hints/bsdos.sh
+++ b/hints/bsdos.sh
@@ -33,9 +33,6 @@ libswanted="$*"
 glibpth="$glibpth /usr/X11/lib"
 ldflags="$ldflags -L/usr/X11/lib"
 
-# Avoid telldir prototype conflict in pp_sys.c
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 case "$optimize" in
 '')     optimize='-O2' ;;
 esac
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index 2e8ffac5bd..ae49f503a0 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -184,10 +184,10 @@ if [ "X$usethreads" != "X" ]; then
     # Threads interfaces changed with V4.0.
     case "$_DEC_uname_r" in
     *[123].*)	libswanted="$libswanted pthreads mach exc c_r"
-		ccflags="-DUSE_THREADS -threads $ccflags"
+		ccflags="-threads $ccflags"
 		;;
     *)		libswanted="$libswanted pthread exc"
-    		ccflags="-DUSE_THREADS -pthread $ccflags"
+    		ccflags="-pthread $ccflags"
 		;;
     esac
     usemymalloc='n'
diff --git a/hints/freebsd.sh b/hints/freebsd.sh
index e20d40d249..5e89d56039 100644
--- a/hints/freebsd.sh
+++ b/hints/freebsd.sh
@@ -94,10 +94,6 @@ case "$osvers" in
 	;;
 esac
 
-# Avoid telldir prototype conflict in pp_sys.c  (FreeBSD uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 cat <<'EOM' >&4
 
 Some users have reported that Configure halts when testing for
@@ -120,5 +116,4 @@ EOM
         exit 1
     fi
     libswanted="$libswanted c_r"
-    ccflags="-DUSE_THREADS $ccflags"
 fi
diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 6d22d524b0..3d8202a8ae 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -84,9 +84,6 @@ case "$cc" in
 	;;
 esac
 
-# This should be a Configure thing, but not for now...
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
-
 # We don't want these libraries.  Anyone know why?
 set `echo X "$libswanted "|sed -e 's/ socket / /' -e 's/ nsl / /' -e 's/ dl / /'`
 shift
@@ -160,8 +157,6 @@ EOF
 	esac
 	unset uname_r
     fi
-    ccflags="-DUSE_THREADS $ccflags"
-    cppflags="-DUSE_THREADS $cppflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be
diff --git a/hints/linux.sh b/hints/linux.sh
index 8ff7f5d747..1ddbca1964 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -195,8 +195,7 @@ fi
 # ccdlflags='-Wl,-E'
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-D_REENTRANT -DUSE_THREADS $ccflags"
-    cppflags="-D_REENTRANT -DUSE_THREADS $cppflags"
+    ccflags="-D_REENTRANT $ccflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be
diff --git a/hints/netbsd.sh b/hints/netbsd.sh
index c508815a46..836c7eff0b 100644
--- a/hints/netbsd.sh
+++ b/hints/netbsd.sh
@@ -56,7 +56,3 @@ case "$osvers" in
 	d_setruid="$undef"
 	;;
 esac
-
-# Avoid telldir prototype conflict in pp_sys.c  (NetBSD uses const DIR *)
-# Configure should test for this.  Volunteers?
-pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
diff --git a/hints/next_3.sh b/hints/next_3.sh
index 542a313a11..43340c03ad 100644
--- a/hints/next_3.sh
+++ b/hints/next_3.sh
@@ -99,8 +99,6 @@ ld='cc'
 i_utime='undef'
 groupstype='int'
 direntrytype='struct direct'
-netdb_host_type='char *'
-netdb_hlen_type='int'
 d_strcoll='undef'
 d_uname='define'
 #
diff --git a/hints/next_4.sh b/hints/next_4.sh
index d34400200b..b3887e612b 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -83,8 +83,6 @@ i_dbm='define'
 i_utime='undef'
 groupstype='int'
 direntrytype='struct direct'
-netdb_host_type='const char *'
-netdb_hlen_type='int'
 
 usemymalloc='y'
 clocktype='int'
diff --git a/hints/os2.sh b/hints/os2.sh
index a012a7317a..7cda0bf89b 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -246,8 +246,8 @@ case "X$optimize" in
 esac
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-DUSE_THREADS -Zmt $ccflags"
-    cppflags="-DUSE_THREADS -Zmt $cppflags"
+    ccflags="-Zmt $ccflags"
+    cppflags="-Zmt $cppflags"  # Do we really need to set this?
     aout_ccflags="-DUSE_THREADS $aout_ccflags"
     aout_cppflags="-DUSE_THREADS $aout_cppflags"
     aout_lddlflags="-Zmt $aout_lddlflags"
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index 6b24dd1ef2..55d0416388 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -224,8 +224,7 @@ fi
 rm -f core
 
 if [ "X$usethreads" != "X" ]; then
-    ccflags="-D_REENTRANT -DUSE_THREADS $ccflags"
-    cppflags="-D_REENTRANT -DUSE_THREADS $cppflags"
+    ccflags="-D_REENTRANT $ccflags"
     # -lpthread needs to come before -lc but after other libraries such
     # as -lgdbm and such like. We assume here that -lc is present in
     # libswanted. If that fails to be true in future, then this can be
diff --git a/makedepend.SH b/makedepend.SH
index 7583543534..dceca0baee 100755
--- a/makedepend.SH
+++ b/makedepend.SH
@@ -105,7 +105,7 @@ for file in `$cat .clist`; do
     */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
     *)   finc= ;;
     esac
-    $echo "Finding dependencies for $filebase$obj_ext."
+    $echo "Finding dependencies for $filebase$_o."
     ( $echo "#line 1 \"$file\""; \
       $sed -n <$file \
 	-e "/^${filebase}_init(/q" \
diff --git a/perl.c b/perl.c
index 41d2e04025..6b5b2f61b2 100644
--- a/perl.c
+++ b/perl.c
@@ -2631,7 +2631,7 @@ init_perllib(void)
     }
 
 /* Use the ~-expanded versions of APPLLIB (undocumented),
-    ARCHLIB PRIVLIB SITEARCH SITELIB and OLDARCHLIB
+    ARCHLIB PRIVLIB SITEARCH and SITELIB 
 */
 #ifdef APPLLIB_EXP
     incpush(APPLLIB_EXP, FALSE);
@@ -2651,10 +2651,6 @@ init_perllib(void)
 #ifdef SITELIB_EXP
     incpush(SITELIB_EXP, FALSE);
 #endif
-#ifdef OLDARCHLIB_EXP  /* 5.00[01] compatibility */
-    incpush(OLDARCHLIB_EXP, FALSE);
-#endif
-    
     if (!tainting)
 	incpush(".", FALSE);
 }
diff --git a/perl.h b/perl.h
index 686752c5c3..9b521b9d3c 100644
--- a/perl.h
+++ b/perl.h
@@ -118,10 +118,6 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 # define DONT_DECLARE_STD 1
 #endif
 
-#if defined(NeXT) && !defined(_POSIX_SOURCE)
-#   define MISSING_PID_T
-#endif
-
 #if defined(HASVOLATILE) || defined(STANDARD_C)
 #   ifdef __cplusplus
 #	define VOL		// to temporarily suppress warnings
@@ -138,10 +134,6 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 #define TAINT_ENV()	if (tainting) { taint_env(); }
 #define TAINT_PROPER(s)	if (tainting) { taint_proper(no_security, s); }
 
-#ifdef MISSING_PID_T
-typedef int pid_t;
-#endif
-
 /* XXX All process group stuff is handled in pp_sys.c.  Should these 
    defines move there?  If so, I could simplify this a lot. --AD  9/96.
 */
diff --git a/pp.c b/pp.c
index 2512979170..4264e9b8a1 100644
--- a/pp.c
+++ b/pp.c
@@ -105,12 +105,16 @@ static bool srand_called = FALSE;
 
 /* variations on pp_null */
 
-#ifdef DONT_DECLARE_STD
 #ifdef I_UNISTD
 #include <unistd.h>
 #endif
-#else
-extern pid_t getpid (void);
+
+/* XXX I can't imagine anyone who doesn't have this actually _needs_
+   it, since pid_t is an integral type.
+   --AD  2/20/1998
+*/
+#ifdef NEED_GETPID_PROTO
+extern Pid_t getpid (void);
 #endif
 
 PP(pp_stub)
diff --git a/pp_sys.c b/pp_sys.c
index ec49864120..f90299289a 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -2915,9 +2915,9 @@ PP(pp_telldir)
 {
     djSP; dTARGET;
 #if defined(HAS_TELLDIR) || defined(telldir)
-#if !defined(telldir) && !defined(HAS_TELLDIR_PROTOTYPE) && !defined(DONT_DECLARE_STD)
+# ifdef NEED_TELLDIR_PROTO /* XXX does _anyone_ need this? --AD 2/20/1998 */
     long telldir _((DIR *));
-#endif
+# endif
     GV *gv = (GV*)POPs;
     register IO *io = GvIOn(gv);
 
diff --git a/t/lib/thread.t b/t/lib/thread.t
index 9810ae48d9..b8e1b387ba 100755
--- a/t/lib/thread.t
+++ b/t/lib/thread.t
@@ -4,7 +4,7 @@ BEGIN {
     chdir 't' if -d 't';
     @INC = '../lib';
     require Config; import Config;
-    if ($Config{'ccflags'} !~ /USE_THREADS\b/) {
+    if (! $Config{'usethreads'}) {
 	print "1..0\n";
 	exit 0;
     }
diff --git a/t/op/nothread.t b/t/op/nothread.t
index 7d42d276c8..a0d444d90b 100755
--- a/t/op/nothread.t
+++ b/t/op/nothread.t
@@ -9,7 +9,7 @@ BEGIN
   @INC = "../lib";
   require Config;
   import Config;
-  if ($Config{'ccflags'} =~ /USE_THREADS\b/)
+  if ($Config{'usethreads'})
    {
     print "1..0\n";
     exit 0;
diff --git a/x2p/Makefile.SH b/x2p/Makefile.SH
index dea2392ec4..bf7495a39b 100755
--- a/x2p/Makefile.SH
+++ b/x2p/Makefile.SH
@@ -46,13 +46,12 @@ $make_set_make
 # grrr
 SHELL = $sh
 
-# These variables will be used in a future version to make
-# the make file more portable to non-unix systems.
+# These variables may need to be manually set for non-Unix systems.
 AR = $ar
-EXE_EXT = $exe_ext
-LIB_EXT = $lib_ext
-OBJ_EXT = $obj_ext
-PATH_SEP = $path_sep
+EXE_EXT = $_ext
+LIB_EXT = $_a
+OBJ_EXT = $_o
+PATH_SEP = $p_
 
 FIRSTMAKEFILE = $firstmakefile