X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Configure;h=71b7feb3870e6704be5b0617596225c9b9bfaf79;hb=24b5d5ccc3bc7535f387e48d7e29656751ae98a5;hp=4cdd0c2c4fd96ffb163d5b239f5a45af6c467947;hpb=6d5328bc15982a12e4db34e42922fa0ff551ed7c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Configure b/Configure
index 4cdd0c2..71b7feb 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Wed Mar 20 05:22:55 EET 2002 [metaconfig 3.0 PL70]
+# Generated on Tue Apr  9 18:44:25 EET DST 2002 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -2387,7 +2387,16 @@ EOM
                     fi
                 fi  
                 case "$ans" in
-                [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no ;;
+                [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no;
+                       if $test -f usethreads.cbu; then
+                           $cat >&4 <<EOM 
+
+*** However, any setting of the C compiler flags (e.g. for thread support)
+*** has been lost.  It may be necessary to pass -Dcc=gcc to Configure
+*** (together with e.g. -Dusethreads).
+
+EOM
+                       fi;;
                 esac
             fi
         fi
@@ -3066,6 +3075,9 @@ EOM
 			;;
 		next*) osname=next ;;
 		nonstop-ux) osname=nonstopux ;;
+		openbsd) osname=openbsd
+                	osvers="$3"
+                	;;
 		POSIX-BC | posix-bc ) osname=posix-bc
 			osvers="$3"
 			;;
@@ -3412,7 +3424,13 @@ esac'
 
 case "$usethreads" in
 $define|true|[yY]*)     dflt='y';;
-*) dflt='n';;
+*)     # Catch case where user specified ithreads or 5005threads but
+       # forgot -Dusethreads (A.D. 4/2002)
+       case "$useithreads$use5005threads" in
+       *$define*)      dflt='y' ;;
+       *)      dflt='n';;
+       esac
+       ;;
 esac
 cat <<EOM
 
@@ -5690,7 +5708,7 @@ done >libc.tmp
 $echo $n ".$c"
 $grep fprintf libc.tmp > libc.ptf
 xscan='eval "<libc.ptf $com >libc.list"; $echo $n ".$c" >&4'
-xrun='eval "<libc.tmp $com >libc.list"; echo "done" >&4'
+xrun='eval "<libc.tmp $com >libc.list"; echo "done." >&4'
 xxx='[ADTSIW]'
 if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx  *_[_.]*//p' -e 's/^.* $xxx  *//p'";\
 	eval $xscan;\
@@ -8378,6 +8396,12 @@ esac
 set versiononly
 eval $setvar
 
+case "$versiononly" in
+"$define") inc_version_list=''
+           inc_version_list_init=0
+           ;;
+esac
+
 : figure out how to guarantee perl startup
 case "$startperl" in
 '')
@@ -9066,6 +9090,10 @@ eval $inlibc
 set alarm d_alarm
 eval $inlibc
 
+: see if POSIX threads are available
+set pthread.h i_pthread
+eval $inhdr
+
 : define a fucntion to check prototypes
 $cat > protochk <<EOSH
 $startsh
@@ -9075,6 +9103,9 @@ ccflags="$ccflags"
 prototype="$prototype"
 define="$define"
 rm=$rm
+usethreads=$usethreads
+i_pthread=$i_pthread
+pthread_h_first=$pthread_h_first
 EOSH
 
 $cat >> protochk <<'EOSH'
@@ -9087,6 +9118,14 @@ while test $# -ge 2; do
 		$define) echo "#include <$2>" >> try.c ;;
 		literal) echo "$2" >> try.c ;;
 	esac
+    # Extra magic for the benefit of systems that need pthread.h
+    # to be included early to correctly detect threadsafe functions.
+    # Such functions must guarantee themselves, though, that the usethreads
+    # and i_pthread have been defined, before calling protochk.
+    if test "$usethreads" = "$define" -a "$i_pthread" = "$define" -a "$pthread_h_first" = "$define" -a "$pthread_h_done" = ""; then
+	echo "#include <pthread.h>" >> try.c
+	pthread_h_done=yes
+    fi
     shift 2
 done
 test "$prototype" = "$define"  && echo '#define CAN_PROTOTYPE' >> try.c
@@ -9276,6 +9315,11 @@ eval $inlibc
 case "$d_asctime_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h"
+	case "time" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_asctime_r_proto:$usethreads" in
 	":define")	d_asctime_r_proto=define
 		set d_asctime_r_proto asctime_r $hdrs
@@ -9301,7 +9345,7 @@ case "$d_asctime_r" in
 	./protochk "extern $try" $hdrs && asctime_r_proto=I_SBI ;;
 	esac
 	case "$asctime_r_proto" in
-	'')	d_asctime_r=undef
+	''|0)	d_asctime_r=undef
  	        asctime_r_proto=0
 		echo "Disabling asctime_r, cannot determine prototype." >&4 ;;
 	* )	case "$asctime_r_proto" in
@@ -9314,6 +9358,8 @@ case "$d_asctime_r" in
 	*)	case "$usethreads" in
 		define) echo "asctime_r has no prototype, not using it." >&4 ;;
 		esac
+		d_asctime_r=undef
+		asctime_r_proto=0
 		;;
 	esac
 	;;
@@ -9932,6 +9978,11 @@ eval $inlibc
 case "$d_crypt_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_crypt crypt.h"
+	case "crypt" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_crypt_r_proto:$usethreads" in
 	":define")	d_crypt_r_proto=define
 		set d_crypt_r_proto crypt_r $hdrs
@@ -9949,7 +10000,7 @@ case "$d_crypt_r" in
 	./protochk "extern $try" $hdrs && crypt_r_proto=B_CCD ;;
 	esac
 	case "$crypt_r_proto" in
-	'')	d_crypt_r=undef
+	''|0)	d_crypt_r=undef
  	        crypt_r_proto=0
 		echo "Disabling crypt_r, cannot determine prototype." >&4 ;;
 	* )	case "$crypt_r_proto" in
@@ -9962,6 +10013,8 @@ case "$d_crypt_r" in
 	*)	case "$usethreads" in
 		define) echo "crypt_r has no prototype, not using it." >&4 ;;
 		esac
+		d_crypt_r=undef
+		crypt_r_proto=0
 		;;
 	esac
 	;;
@@ -9986,7 +10039,12 @@ set ctermid_r d_ctermid_r
 eval $inlibc
 case "$d_ctermid_r" in
 "$define")
-	hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h"
+	hdrs="$i_systypes sys/types.h define stdio.h "
+	case "stdio" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_ctermid_r_proto:$usethreads" in
 	":define")	d_ctermid_r_proto=define
 		set d_ctermid_r_proto ctermid_r $hdrs
@@ -10000,7 +10058,7 @@ case "$d_ctermid_r" in
 	./protochk "extern $try" $hdrs && ctermid_r_proto=B_B ;;
 	esac
 	case "$ctermid_r_proto" in
-	'')	d_ctermid_r=undef
+	''|0)	d_ctermid_r=undef
  	        ctermid_r_proto=0
 		echo "Disabling ctermid_r, cannot determine prototype." >&4 ;;
 	* )	case "$ctermid_r_proto" in
@@ -10013,6 +10071,8 @@ case "$d_ctermid_r" in
 	*)	case "$usethreads" in
 		define) echo "ctermid_r has no prototype, not using it." >&4 ;;
 		esac
+		d_ctermid_r=undef
+		ctermid_r_proto=0
 		;;
 	esac
 	;;
@@ -10026,6 +10086,11 @@ eval $inlibc
 case "$d_ctime_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h"
+	case "time" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_ctime_r_proto:$usethreads" in
 	":define")	d_ctime_r_proto=define
 		set d_ctime_r_proto ctime_r $hdrs
@@ -10051,7 +10116,7 @@ case "$d_ctime_r" in
 	./protochk "extern $try" $hdrs && ctime_r_proto=I_SBI ;;
 	esac
 	case "$ctime_r_proto" in
-	'')	d_ctime_r=undef
+	''|0)	d_ctime_r=undef
  	        ctime_r_proto=0
 		echo "Disabling ctime_r, cannot determine prototype." >&4 ;;
 	* )	case "$ctime_r_proto" in
@@ -10064,6 +10129,8 @@ case "$d_ctime_r" in
 	*)	case "$usethreads" in
 		define) echo "ctime_r has no prototype, not using it." >&4 ;;
 		esac
+		d_ctime_r=undef
+		ctime_r_proto=0
 		;;
 	esac
 	;;
@@ -10397,6 +10464,11 @@ eval $inlibc
 case "$d_drand48_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "stdlib" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_drand48_r_proto:$usethreads" in
 	":define")	d_drand48_r_proto=define
 		set d_drand48_r_proto drand48_r $hdrs
@@ -10410,7 +10482,7 @@ case "$d_drand48_r" in
 	./protochk "extern $try" $hdrs && drand48_r_proto=I_ST ;;
 	esac
 	case "$drand48_r_proto" in
-	'')	d_drand48_r=undef
+	''|0)	d_drand48_r=undef
  	        drand48_r_proto=0
 		echo "Disabling drand48_r, cannot determine prototype." >&4 ;;
 	* )	case "$drand48_r_proto" in
@@ -10423,6 +10495,8 @@ case "$d_drand48_r" in
 	*)	case "$usethreads" in
 		define) echo "drand48_r has no prototype, not using it." >&4 ;;
 		esac
+		d_drand48_r=undef
+		drand48_r_proto=0
 		;;
 	esac
 	;;
@@ -10478,6 +10552,11 @@ eval $inlibc
 case "$d_endgrent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "grp" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endgrent_r_proto:$usethreads" in
 	":define")	d_endgrent_r_proto=define
 		set d_endgrent_r_proto endgrent_r $hdrs
@@ -10495,7 +10574,7 @@ case "$d_endgrent_r" in
 	./protochk "extern $try" $hdrs && endgrent_r_proto=V_H ;;
 	esac
 	case "$endgrent_r_proto" in
-	'')	d_endgrent_r=undef
+	''|0)	d_endgrent_r=undef
  	        endgrent_r_proto=0
 		echo "Disabling endgrent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endgrent_r_proto" in
@@ -10508,6 +10587,8 @@ case "$d_endgrent_r" in
 	*)	case "$usethreads" in
 		define) echo "endgrent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endgrent_r=undef
+		endgrent_r_proto=0
 		;;
 	esac
 	;;
@@ -10529,6 +10610,11 @@ eval $inlibc
 case "$d_endhostent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endhostent_r_proto:$usethreads" in
 	":define")	d_endhostent_r_proto=define
 		set d_endhostent_r_proto endhostent_r $hdrs
@@ -10539,14 +10625,14 @@ case "$d_endhostent_r" in
 	define)
 	case "$endhostent_r_proto" in
 	''|0) try='int endhostent_r(struct hostent_data*);'
-	./protochk "extern $try" $hdrs && endhostent_r_proto=I_S ;;
+	./protochk "extern $try" $hdrs && endhostent_r_proto=I_D ;;
 	esac
 	case "$endhostent_r_proto" in
 	''|0) try='void endhostent_r(struct hostent_data*);'
-	./protochk "extern $try" $hdrs && endhostent_r_proto=V_S ;;
+	./protochk "extern $try" $hdrs && endhostent_r_proto=V_D ;;
 	esac
 	case "$endhostent_r_proto" in
-	'')	d_endhostent_r=undef
+	''|0)	d_endhostent_r=undef
  	        endhostent_r_proto=0
 		echo "Disabling endhostent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endhostent_r_proto" in
@@ -10559,6 +10645,8 @@ case "$d_endhostent_r" in
 	*)	case "$usethreads" in
 		define) echo "endhostent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endhostent_r=undef
+		endhostent_r_proto=0
 		;;
 	esac
 	;;
@@ -10576,6 +10664,11 @@ eval $inlibc
 case "$d_endnetent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endnetent_r_proto:$usethreads" in
 	":define")	d_endnetent_r_proto=define
 		set d_endnetent_r_proto endnetent_r $hdrs
@@ -10586,14 +10679,14 @@ case "$d_endnetent_r" in
 	define)
 	case "$endnetent_r_proto" in
 	''|0) try='int endnetent_r(struct netent_data*);'
-	./protochk "extern $try" $hdrs && endnetent_r_proto=I_S ;;
+	./protochk "extern $try" $hdrs && endnetent_r_proto=I_D ;;
 	esac
 	case "$endnetent_r_proto" in
 	''|0) try='void endnetent_r(struct netent_data*);'
-	./protochk "extern $try" $hdrs && endnetent_r_proto=V_S ;;
+	./protochk "extern $try" $hdrs && endnetent_r_proto=V_D ;;
 	esac
 	case "$endnetent_r_proto" in
-	'')	d_endnetent_r=undef
+	''|0)	d_endnetent_r=undef
  	        endnetent_r_proto=0
 		echo "Disabling endnetent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endnetent_r_proto" in
@@ -10606,6 +10699,8 @@ case "$d_endnetent_r" in
 	*)	case "$usethreads" in
 		define) echo "endnetent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endnetent_r=undef
+		endnetent_r_proto=0
 		;;
 	esac
 	;;
@@ -10623,6 +10718,11 @@ eval $inlibc
 case "$d_endprotoent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endprotoent_r_proto:$usethreads" in
 	":define")	d_endprotoent_r_proto=define
 		set d_endprotoent_r_proto endprotoent_r $hdrs
@@ -10633,14 +10733,14 @@ case "$d_endprotoent_r" in
 	define)
 	case "$endprotoent_r_proto" in
 	''|0) try='int endprotoent_r(struct protoent_data*);'
-	./protochk "extern $try" $hdrs && endprotoent_r_proto=I_S ;;
+	./protochk "extern $try" $hdrs && endprotoent_r_proto=I_D ;;
 	esac
 	case "$endprotoent_r_proto" in
 	''|0) try='void endprotoent_r(struct protoent_data*);'
-	./protochk "extern $try" $hdrs && endprotoent_r_proto=V_S ;;
+	./protochk "extern $try" $hdrs && endprotoent_r_proto=V_D ;;
 	esac
 	case "$endprotoent_r_proto" in
-	'')	d_endprotoent_r=undef
+	''|0)	d_endprotoent_r=undef
  	        endprotoent_r_proto=0
 		echo "Disabling endprotoent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endprotoent_r_proto" in
@@ -10653,6 +10753,8 @@ case "$d_endprotoent_r" in
 	*)	case "$usethreads" in
 		define) echo "endprotoent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endprotoent_r=undef
+		endprotoent_r_proto=0
 		;;
 	esac
 	;;
@@ -10758,6 +10860,11 @@ eval $inlibc
 case "$d_endpwent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "pwd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endpwent_r_proto:$usethreads" in
 	":define")	d_endpwent_r_proto=define
 		set d_endpwent_r_proto endpwent_r $hdrs
@@ -10775,7 +10882,7 @@ case "$d_endpwent_r" in
 	./protochk "extern $try" $hdrs && endpwent_r_proto=V_H ;;
 	esac
 	case "$endpwent_r_proto" in
-	'')	d_endpwent_r=undef
+	''|0)	d_endpwent_r=undef
  	        endpwent_r_proto=0
 		echo "Disabling endpwent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endpwent_r_proto" in
@@ -10788,6 +10895,8 @@ case "$d_endpwent_r" in
 	*)	case "$usethreads" in
 		define) echo "endpwent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endpwent_r=undef
+		endpwent_r_proto=0
 		;;
 	esac
 	;;
@@ -10805,6 +10914,11 @@ eval $inlibc
 case "$d_endservent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_endservent_r_proto:$usethreads" in
 	":define")	d_endservent_r_proto=define
 		set d_endservent_r_proto endservent_r $hdrs
@@ -10815,14 +10929,14 @@ case "$d_endservent_r" in
 	define)
 	case "$endservent_r_proto" in
 	''|0) try='int endservent_r(struct servent_data*);'
-	./protochk "extern $try" $hdrs && endservent_r_proto=I_S ;;
+	./protochk "extern $try" $hdrs && endservent_r_proto=I_D ;;
 	esac
 	case "$endservent_r_proto" in
 	''|0) try='void endservent_r(struct servent_data*);'
-	./protochk "extern $try" $hdrs && endservent_r_proto=V_S ;;
+	./protochk "extern $try" $hdrs && endservent_r_proto=V_D ;;
 	esac
 	case "$endservent_r_proto" in
-	'')	d_endservent_r=undef
+	''|0)	d_endservent_r=undef
  	        endservent_r_proto=0
 		echo "Disabling endservent_r, cannot determine prototype." >&4 ;;
 	* )	case "$endservent_r_proto" in
@@ -10835,6 +10949,8 @@ case "$d_endservent_r" in
 	*)	case "$usethreads" in
 		define) echo "endservent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_endservent_r=undef
+		endservent_r_proto=0
 		;;
 	esac
 	;;
@@ -11479,6 +11595,11 @@ eval $inlibc
 case "$d_getgrent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "grp" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getgrent_r_proto:$usethreads" in
 	":define")	d_getgrent_r_proto=define
 		set d_getgrent_r_proto getgrent_r $hdrs
@@ -11512,7 +11633,7 @@ case "$d_getgrent_r" in
 	./protochk "extern $try" $hdrs && getgrent_r_proto=I_SBIH ;;
 	esac
 	case "$getgrent_r_proto" in
-	'')	d_getgrent_r=undef
+	''|0)	d_getgrent_r=undef
  	        getgrent_r_proto=0
 		echo "Disabling getgrent_r, cannot determine prototype." >&4 ;;
 	* )	case "$getgrent_r_proto" in
@@ -11525,6 +11646,8 @@ case "$d_getgrent_r" in
 	*)	case "$usethreads" in
 		define) echo "getgrent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getgrent_r=undef
+		getgrent_r_proto=0
 		;;
 	esac
 	;;
@@ -11538,6 +11661,11 @@ eval $inlibc
 case "$d_getgrgid_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "grp" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getgrgid_r_proto:$usethreads" in
 	":define")	d_getgrgid_r_proto=define
 		set d_getgrgid_r_proto getgrgid_r $hdrs
@@ -11563,7 +11691,7 @@ case "$d_getgrgid_r" in
 	./protochk "extern $try" $hdrs && getgrgid_r_proto=S_TSBI ;;
 	esac
 	case "$getgrgid_r_proto" in
-	'')	d_getgrgid_r=undef
+	''|0)	d_getgrgid_r=undef
  	        getgrgid_r_proto=0
 		echo "Disabling getgrgid_r, cannot determine prototype." >&4 ;;
 	* )	case "$getgrgid_r_proto" in
@@ -11576,6 +11704,8 @@ case "$d_getgrgid_r" in
 	*)	case "$usethreads" in
 		define) echo "getgrgid_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getgrgid_r=undef
+		getgrgid_r_proto=0
 		;;
 	esac
 	;;
@@ -11589,6 +11719,11 @@ eval $inlibc
 case "$d_getgrnam_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "grp" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getgrnam_r_proto:$usethreads" in
 	":define")	d_getgrnam_r_proto=define
 		set d_getgrnam_r_proto getgrnam_r $hdrs
@@ -11618,7 +11753,7 @@ case "$d_getgrnam_r" in
 	./protochk "extern $try" $hdrs && getgrnam_r_proto=S_CSBI ;;
 	esac
 	case "$getgrnam_r_proto" in
-	'')	d_getgrnam_r=undef
+	''|0)	d_getgrnam_r=undef
  	        getgrnam_r_proto=0
 		echo "Disabling getgrnam_r, cannot determine prototype." >&4 ;;
 	* )	case "$getgrnam_r_proto" in
@@ -11631,6 +11766,8 @@ case "$d_getgrnam_r" in
 	*)	case "$usethreads" in
 		define) echo "getgrnam_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getgrnam_r=undef
+		getgrnam_r_proto=0
 		;;
 	esac
 	;;
@@ -11741,6 +11878,11 @@ eval $inlibc
 case "$d_gethostbyaddr_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_gethostbyaddr_r_proto:$usethreads" in
 	":define")	d_gethostbyaddr_r_proto=define
 		set d_gethostbyaddr_r_proto gethostbyaddr_r $hdrs
@@ -11790,7 +11932,7 @@ case "$d_gethostbyaddr_r" in
 	./protochk "extern $try" $hdrs && gethostbyaddr_r_proto=I_CII ;;
 	esac
 	case "$gethostbyaddr_r_proto" in
-	'')	d_gethostbyaddr_r=undef
+	''|0)	d_gethostbyaddr_r=undef
  	        gethostbyaddr_r_proto=0
 		echo "Disabling gethostbyaddr_r, cannot determine prototype." >&4 ;;
 	* )	case "$gethostbyaddr_r_proto" in
@@ -11803,6 +11945,8 @@ case "$d_gethostbyaddr_r" in
 	*)	case "$usethreads" in
 		define) echo "gethostbyaddr_r has no prototype, not using it." >&4 ;;
 		esac
+		d_gethostbyaddr_r=undef
+		gethostbyaddr_r_proto=0
 		;;
 	esac
 	;;
@@ -11816,6 +11960,11 @@ eval $inlibc
 case "$d_gethostbyname_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_gethostbyname_r_proto:$usethreads" in
 	":define")	d_gethostbyname_r_proto=define
 		set d_gethostbyname_r_proto gethostbyname_r $hdrs
@@ -11837,7 +11986,7 @@ case "$d_gethostbyname_r" in
 	./protochk "extern $try" $hdrs && gethostbyname_r_proto=I_CSD ;;
 	esac
 	case "$gethostbyname_r_proto" in
-	'')	d_gethostbyname_r=undef
+	''|0)	d_gethostbyname_r=undef
  	        gethostbyname_r_proto=0
 		echo "Disabling gethostbyname_r, cannot determine prototype." >&4 ;;
 	* )	case "$gethostbyname_r_proto" in
@@ -11850,6 +11999,8 @@ case "$d_gethostbyname_r" in
 	*)	case "$usethreads" in
 		define) echo "gethostbyname_r has no prototype, not using it." >&4 ;;
 		esac
+		d_gethostbyname_r=undef
+		gethostbyname_r_proto=0
 		;;
 	esac
 	;;
@@ -11863,6 +12014,11 @@ eval $inlibc
 case "$d_gethostent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_gethostent_r_proto:$usethreads" in
 	":define")	d_gethostent_r_proto=define
 		set d_gethostent_r_proto gethostent_r $hdrs
@@ -11896,7 +12052,7 @@ case "$d_gethostent_r" in
 	./protochk "extern $try" $hdrs && gethostent_r_proto=I_SD ;;
 	esac
 	case "$gethostent_r_proto" in
-	'')	d_gethostent_r=undef
+	''|0)	d_gethostent_r=undef
  	        gethostent_r_proto=0
 		echo "Disabling gethostent_r, cannot determine prototype." >&4 ;;
 	* )	case "$gethostent_r_proto" in
@@ -11909,6 +12065,8 @@ case "$d_gethostent_r" in
 	*)	case "$usethreads" in
 		define) echo "gethostent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_gethostent_r=undef
+		gethostent_r_proto=0
 		;;
 	esac
 	;;
@@ -11935,6 +12093,11 @@ eval $inlibc
 case "$d_getlogin_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_unistd unistd.h"
+	case "unistd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getlogin_r_proto:$usethreads" in
 	":define")	d_getlogin_r_proto=define
 		set d_getlogin_r_proto getlogin_r $hdrs
@@ -11960,7 +12123,7 @@ case "$d_getlogin_r" in
 	./protochk "extern $try" $hdrs && getlogin_r_proto=B_BI ;;
 	esac
 	case "$getlogin_r_proto" in
-	'')	d_getlogin_r=undef
+	''|0)	d_getlogin_r=undef
  	        getlogin_r_proto=0
 		echo "Disabling getlogin_r, cannot determine prototype." >&4 ;;
 	* )	case "$getlogin_r_proto" in
@@ -11973,6 +12136,8 @@ case "$d_getlogin_r" in
 	*)	case "$usethreads" in
 		define) echo "getlogin_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getlogin_r=undef
+		getlogin_r_proto=0
 		;;
 	esac
 	;;
@@ -12006,6 +12171,11 @@ eval $inlibc
 case "$d_getnetbyaddr_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getnetbyaddr_r_proto:$usethreads" in
 	":define")	d_getnetbyaddr_r_proto=define
 		set d_getnetbyaddr_r_proto getnetbyaddr_r $hdrs
@@ -12043,7 +12213,7 @@ case "$d_getnetbyaddr_r" in
 	./protochk "extern $try" $hdrs && getnetbyaddr_r_proto=I_IISD ;;
 	esac
 	case "$getnetbyaddr_r_proto" in
-	'')	d_getnetbyaddr_r=undef
+	''|0)	d_getnetbyaddr_r=undef
  	        getnetbyaddr_r_proto=0
 		echo "Disabling getnetbyaddr_r, cannot determine prototype." >&4 ;;
 	* )	case "$getnetbyaddr_r_proto" in
@@ -12056,6 +12226,8 @@ case "$d_getnetbyaddr_r" in
 	*)	case "$usethreads" in
 		define) echo "getnetbyaddr_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getnetbyaddr_r=undef
+		getnetbyaddr_r_proto=0
 		;;
 	esac
 	;;
@@ -12069,6 +12241,11 @@ eval $inlibc
 case "$d_getnetbyname_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getnetbyname_r_proto:$usethreads" in
 	":define")	d_getnetbyname_r_proto=define
 		set d_getnetbyname_r_proto getnetbyname_r $hdrs
@@ -12094,7 +12271,7 @@ case "$d_getnetbyname_r" in
 	./protochk "extern $try" $hdrs && getnetbyname_r_proto=I_CSD ;;
 	esac
 	case "$getnetbyname_r_proto" in
-	'')	d_getnetbyname_r=undef
+	''|0)	d_getnetbyname_r=undef
  	        getnetbyname_r_proto=0
 		echo "Disabling getnetbyname_r, cannot determine prototype." >&4 ;;
 	* )	case "$getnetbyname_r_proto" in
@@ -12107,6 +12284,8 @@ case "$d_getnetbyname_r" in
 	*)	case "$usethreads" in
 		define) echo "getnetbyname_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getnetbyname_r=undef
+		getnetbyname_r_proto=0
 		;;
 	esac
 	;;
@@ -12120,6 +12299,11 @@ eval $inlibc
 case "$d_getnetent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getnetent_r_proto:$usethreads" in
 	":define")	d_getnetent_r_proto=define
 		set d_getnetent_r_proto getnetent_r $hdrs
@@ -12153,7 +12337,7 @@ case "$d_getnetent_r" in
 	./protochk "extern $try" $hdrs && getnetent_r_proto=I_SD ;;
 	esac
 	case "$getnetent_r_proto" in
-	'')	d_getnetent_r=undef
+	''|0)	d_getnetent_r=undef
  	        getnetent_r_proto=0
 		echo "Disabling getnetent_r, cannot determine prototype." >&4 ;;
 	* )	case "$getnetent_r_proto" in
@@ -12166,6 +12350,8 @@ case "$d_getnetent_r" in
 	*)	case "$usethreads" in
 		define) echo "getnetent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getnetent_r=undef
+		getnetent_r_proto=0
 		;;
 	esac
 	;;
@@ -12217,6 +12403,11 @@ eval $inlibc
 case "$d_getprotobyname_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getprotobyname_r_proto:$usethreads" in
 	":define")	d_getprotobyname_r_proto=define
 		set d_getprotobyname_r_proto getprotobyname_r $hdrs
@@ -12238,7 +12429,7 @@ case "$d_getprotobyname_r" in
 	./protochk "extern $try" $hdrs && getprotobyname_r_proto=I_CSD ;;
 	esac
 	case "$getprotobyname_r_proto" in
-	'')	d_getprotobyname_r=undef
+	''|0)	d_getprotobyname_r=undef
  	        getprotobyname_r_proto=0
 		echo "Disabling getprotobyname_r, cannot determine prototype." >&4 ;;
 	* )	case "$getprotobyname_r_proto" in
@@ -12251,6 +12442,8 @@ case "$d_getprotobyname_r" in
 	*)	case "$usethreads" in
 		define) echo "getprotobyname_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getprotobyname_r=undef
+		getprotobyname_r_proto=0
 		;;
 	esac
 	;;
@@ -12264,6 +12457,11 @@ eval $inlibc
 case "$d_getprotobynumber_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getprotobynumber_r_proto:$usethreads" in
 	":define")	d_getprotobynumber_r_proto=define
 		set d_getprotobynumber_r_proto getprotobynumber_r $hdrs
@@ -12285,7 +12483,7 @@ case "$d_getprotobynumber_r" in
 	./protochk "extern $try" $hdrs && getprotobynumber_r_proto=I_ISD ;;
 	esac
 	case "$getprotobynumber_r_proto" in
-	'')	d_getprotobynumber_r=undef
+	''|0)	d_getprotobynumber_r=undef
  	        getprotobynumber_r_proto=0
 		echo "Disabling getprotobynumber_r, cannot determine prototype." >&4 ;;
 	* )	case "$getprotobynumber_r_proto" in
@@ -12298,6 +12496,8 @@ case "$d_getprotobynumber_r" in
 	*)	case "$usethreads" in
 		define) echo "getprotobynumber_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getprotobynumber_r=undef
+		getprotobynumber_r_proto=0
 		;;
 	esac
 	;;
@@ -12311,6 +12511,11 @@ eval $inlibc
 case "$d_getprotoent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getprotoent_r_proto:$usethreads" in
 	":define")	d_getprotoent_r_proto=define
 		set d_getprotoent_r_proto getprotoent_r $hdrs
@@ -12336,7 +12541,7 @@ case "$d_getprotoent_r" in
 	./protochk "extern $try" $hdrs && getprotoent_r_proto=I_SD ;;
 	esac
 	case "$getprotoent_r_proto" in
-	'')	d_getprotoent_r=undef
+	''|0)	d_getprotoent_r=undef
  	        getprotoent_r_proto=0
 		echo "Disabling getprotoent_r, cannot determine prototype." >&4 ;;
 	* )	case "$getprotoent_r_proto" in
@@ -12349,6 +12554,8 @@ case "$d_getprotoent_r" in
 	*)	case "$usethreads" in
 		define) echo "getprotoent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getprotoent_r=undef
+		getprotoent_r_proto=0
 		;;
 	esac
 	;;
@@ -12375,6 +12582,11 @@ eval $inlibc
 case "$d_getpwent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "pwd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getpwent_r_proto:$usethreads" in
 	":define")	d_getpwent_r_proto=define
 		set d_getpwent_r_proto getpwent_r $hdrs
@@ -12408,7 +12620,7 @@ case "$d_getpwent_r" in
 	./protochk "extern $try" $hdrs && getpwent_r_proto=I_SBIH ;;
 	esac
 	case "$getpwent_r_proto" in
-	'')	d_getpwent_r=undef
+	''|0)	d_getpwent_r=undef
  	        getpwent_r_proto=0
 		echo "Disabling getpwent_r, cannot determine prototype." >&4 ;;
 	* )	case "$getpwent_r_proto" in
@@ -12421,6 +12633,8 @@ case "$d_getpwent_r" in
 	*)	case "$usethreads" in
 		define) echo "getpwent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getpwent_r=undef
+		getpwent_r_proto=0
 		;;
 	esac
 	;;
@@ -12434,6 +12648,11 @@ eval $inlibc
 case "$d_getpwnam_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "pwd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getpwnam_r_proto:$usethreads" in
 	":define")	d_getpwnam_r_proto=define
 		set d_getpwnam_r_proto getpwnam_r $hdrs
@@ -12459,7 +12678,7 @@ case "$d_getpwnam_r" in
 	./protochk "extern $try" $hdrs && getpwnam_r_proto=I_CSBI ;;
 	esac
 	case "$getpwnam_r_proto" in
-	'')	d_getpwnam_r=undef
+	''|0)	d_getpwnam_r=undef
  	        getpwnam_r_proto=0
 		echo "Disabling getpwnam_r, cannot determine prototype." >&4 ;;
 	* )	case "$getpwnam_r_proto" in
@@ -12472,6 +12691,8 @@ case "$d_getpwnam_r" in
 	*)	case "$usethreads" in
 		define) echo "getpwnam_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getpwnam_r=undef
+		getpwnam_r_proto=0
 		;;
 	esac
 	;;
@@ -12485,6 +12706,11 @@ eval $inlibc
 case "$d_getpwuid_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "pwd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getpwuid_r_proto:$usethreads" in
 	":define")	d_getpwuid_r_proto=define
 		set d_getpwuid_r_proto getpwuid_r $hdrs
@@ -12510,7 +12736,7 @@ case "$d_getpwuid_r" in
 	./protochk "extern $try" $hdrs && getpwuid_r_proto=S_TSBI ;;
 	esac
 	case "$getpwuid_r_proto" in
-	'')	d_getpwuid_r=undef
+	''|0)	d_getpwuid_r=undef
  	        getpwuid_r_proto=0
 		echo "Disabling getpwuid_r, cannot determine prototype." >&4 ;;
 	* )	case "$getpwuid_r_proto" in
@@ -12523,6 +12749,8 @@ case "$d_getpwuid_r" in
 	*)	case "$usethreads" in
 		define) echo "getpwuid_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getpwuid_r=undef
+		getpwuid_r_proto=0
 		;;
 	esac
 	;;
@@ -12549,6 +12777,11 @@ eval $inlibc
 case "$d_getservbyname_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getservbyname_r_proto:$usethreads" in
 	":define")	d_getservbyname_r_proto=define
 		set d_getservbyname_r_proto getservbyname_r $hdrs
@@ -12570,7 +12803,7 @@ case "$d_getservbyname_r" in
 	./protochk "extern $try" $hdrs && getservbyname_r_proto=I_CCSD ;;
 	esac
 	case "$getservbyname_r_proto" in
-	'')	d_getservbyname_r=undef
+	''|0)	d_getservbyname_r=undef
  	        getservbyname_r_proto=0
 		echo "Disabling getservbyname_r, cannot determine prototype." >&4 ;;
 	* )	case "$getservbyname_r_proto" in
@@ -12583,6 +12816,8 @@ case "$d_getservbyname_r" in
 	*)	case "$usethreads" in
 		define) echo "getservbyname_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getservbyname_r=undef
+		getservbyname_r_proto=0
 		;;
 	esac
 	;;
@@ -12596,6 +12831,11 @@ eval $inlibc
 case "$d_getservbyport_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getservbyport_r_proto:$usethreads" in
 	":define")	d_getservbyport_r_proto=define
 		set d_getservbyport_r_proto getservbyport_r $hdrs
@@ -12617,7 +12857,7 @@ case "$d_getservbyport_r" in
 	./protochk "extern $try" $hdrs && getservbyport_r_proto=I_ICSD ;;
 	esac
 	case "$getservbyport_r_proto" in
-	'')	d_getservbyport_r=undef
+	''|0)	d_getservbyport_r=undef
  	        getservbyport_r_proto=0
 		echo "Disabling getservbyport_r, cannot determine prototype." >&4 ;;
 	* )	case "$getservbyport_r_proto" in
@@ -12630,6 +12870,8 @@ case "$d_getservbyport_r" in
 	*)	case "$usethreads" in
 		define) echo "getservbyport_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getservbyport_r=undef
+		getservbyport_r_proto=0
 		;;
 	esac
 	;;
@@ -12643,6 +12885,11 @@ eval $inlibc
 case "$d_getservent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getservent_r_proto:$usethreads" in
 	":define")	d_getservent_r_proto=define
 		set d_getservent_r_proto getservent_r $hdrs
@@ -12668,7 +12915,7 @@ case "$d_getservent_r" in
 	./protochk "extern $try" $hdrs && getservent_r_proto=I_SD ;;
 	esac
 	case "$getservent_r_proto" in
-	'')	d_getservent_r=undef
+	''|0)	d_getservent_r=undef
  	        getservent_r_proto=0
 		echo "Disabling getservent_r, cannot determine prototype." >&4 ;;
 	* )	case "$getservent_r_proto" in
@@ -12681,6 +12928,8 @@ case "$d_getservent_r" in
 	*)	case "$usethreads" in
 		define) echo "getservent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getservent_r=undef
+		getservent_r_proto=0
 		;;
 	esac
 	;;
@@ -12707,6 +12956,11 @@ eval $inlibc
 case "$d_getspnam_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_shadow shadow.h"
+	case "shadow" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_getspnam_r_proto:$usethreads" in
 	":define")	d_getspnam_r_proto=define
 		set d_getspnam_r_proto getspnam_r $hdrs
@@ -12724,7 +12978,7 @@ case "$d_getspnam_r" in
 	./protochk "extern $try" $hdrs && getspnam_r_proto=S_CSBI ;;
 	esac
 	case "$getspnam_r_proto" in
-	'')	d_getspnam_r=undef
+	''|0)	d_getspnam_r=undef
  	        getspnam_r_proto=0
 		echo "Disabling getspnam_r, cannot determine prototype." >&4 ;;
 	* )	case "$getspnam_r_proto" in
@@ -12737,6 +12991,8 @@ case "$d_getspnam_r" in
 	*)	case "$usethreads" in
 		define) echo "getspnam_r has no prototype, not using it." >&4 ;;
 		esac
+		d_getspnam_r=undef
+		getspnam_r_proto=0
 		;;
 	esac
 	;;
@@ -12769,6 +13025,11 @@ eval $inlibc
 case "$d_gmtime_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h"
+	case "time" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_gmtime_r_proto:$usethreads" in
 	":define")	d_gmtime_r_proto=define
 		set d_gmtime_r_proto gmtime_r $hdrs
@@ -12786,7 +13047,7 @@ case "$d_gmtime_r" in
 	./protochk "extern $try" $hdrs && gmtime_r_proto=I_TS ;;
 	esac
 	case "$gmtime_r_proto" in
-	'')	d_gmtime_r=undef
+	''|0)	d_gmtime_r=undef
  	        gmtime_r_proto=0
 		echo "Disabling gmtime_r, cannot determine prototype." >&4 ;;
 	* )	case "$gmtime_r_proto" in
@@ -12799,6 +13060,8 @@ case "$d_gmtime_r" in
 	*)	case "$usethreads" in
 		define) echo "gmtime_r has no prototype, not using it." >&4 ;;
 		esac
+		d_gmtime_r=undef
+		gmtime_r_proto=0
 		;;
 	esac
 	;;
@@ -13007,6 +13270,11 @@ eval $inlibc
 case "$d_localtime_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_time time.h"
+	case "time" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_localtime_r_proto:$usethreads" in
 	":define")	d_localtime_r_proto=define
 		set d_localtime_r_proto localtime_r $hdrs
@@ -13024,7 +13292,7 @@ case "$d_localtime_r" in
 	./protochk "extern $try" $hdrs && localtime_r_proto=I_TS ;;
 	esac
 	case "$localtime_r_proto" in
-	'')	d_localtime_r=undef
+	''|0)	d_localtime_r=undef
  	        localtime_r_proto=0
 		echo "Disabling localtime_r, cannot determine prototype." >&4 ;;
 	* )	case "$localtime_r_proto" in
@@ -13037,6 +13305,8 @@ case "$d_localtime_r" in
 	*)	case "$usethreads" in
 		define) echo "localtime_r has no prototype, not using it." >&4 ;;
 		esac
+		d_localtime_r=undef
+		localtime_r_proto=0
 		;;
 	esac
 	;;
@@ -13560,13 +13830,6 @@ $rm -f try.* try
 set d_off64_t
 eval $setvar
 
-: see if POSIX threads are available
-set pthread.h i_pthread
-eval $inhdr
-
-
-
-
 : how to create joinable pthreads
 if test "X$usethreads" = "X$define" -a "X$i_pthread" = "X$define"; then
 	echo " "
@@ -13772,6 +14035,11 @@ eval $inlibc
 case "$d_random_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "stdlib" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_random_r_proto:$usethreads" in
 	":define")	d_random_r_proto=define
 		set d_random_r_proto random_r $hdrs
@@ -13785,7 +14053,7 @@ case "$d_random_r" in
 	./protochk "extern $try" $hdrs && random_r_proto=I_TS ;;
 	esac
 	case "$random_r_proto" in
-	'')	d_random_r=undef
+	''|0)	d_random_r=undef
  	        random_r_proto=0
 		echo "Disabling random_r, cannot determine prototype." >&4 ;;
 	* )	case "$random_r_proto" in
@@ -13798,6 +14066,8 @@ case "$d_random_r" in
 	*)	case "$usethreads" in
 		define) echo "random_r has no prototype, not using it." >&4 ;;
 		esac
+		d_random_r=undef
+		random_r_proto=0
 		;;
 	esac
 	;;
@@ -13821,6 +14091,11 @@ eval $inlibc
 case "$d_readdir64_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_dirent dirent.h"
+	case "dirent" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_readdir64_r_proto:$usethreads" in
 	":define")	d_readdir64_r_proto=define
 		set d_readdir64_r_proto readdir64_r $hdrs
@@ -13838,7 +14113,7 @@ case "$d_readdir64_r" in
 	./protochk "extern $try" $hdrs && readdir64_r_proto=I_TS ;;
 	esac
 	case "$readdir64_r_proto" in
-	'')	d_readdir64_r=undef
+	''|0)	d_readdir64_r=undef
  	        readdir64_r_proto=0
 		echo "Disabling readdir64_r, cannot determine prototype." >&4 ;;
 	* )	case "$readdir64_r_proto" in
@@ -13851,6 +14126,8 @@ case "$d_readdir64_r" in
 	*)	case "$usethreads" in
 		define) echo "readdir64_r has no prototype, not using it." >&4 ;;
 		esac
+		d_readdir64_r=undef
+		readdir64_r_proto=0
 		;;
 	esac
 	;;
@@ -13864,6 +14141,11 @@ eval $inlibc
 case "$d_readdir_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_dirent dirent.h"
+	case "dirent" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_readdir_r_proto:$usethreads" in
 	":define")	d_readdir_r_proto=define
 		set d_readdir_r_proto readdir_r $hdrs
@@ -13881,7 +14163,7 @@ case "$d_readdir_r" in
 	./protochk "extern $try" $hdrs && readdir_r_proto=I_TS ;;
 	esac
 	case "$readdir_r_proto" in
-	'')	d_readdir_r=undef
+	''|0)	d_readdir_r=undef
  	        readdir_r_proto=0
 		echo "Disabling readdir_r, cannot determine prototype." >&4 ;;
 	* )	case "$readdir_r_proto" in
@@ -13894,6 +14176,8 @@ case "$d_readdir_r" in
 	*)	case "$usethreads" in
 		define) echo "readdir_r has no prototype, not using it." >&4 ;;
 		esac
+		d_readdir_r=undef
+		readdir_r_proto=0
 		;;
 	esac
 	;;
@@ -14411,6 +14695,11 @@ eval $inlibc
 case "$d_setgrent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_grp grp.h"
+	case "grp" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setgrent_r_proto:$usethreads" in
 	":define")	d_setgrent_r_proto=define
 		set d_setgrent_r_proto setgrent_r $hdrs
@@ -14428,7 +14717,7 @@ case "$d_setgrent_r" in
 	./protochk "extern $try" $hdrs && setgrent_r_proto=V_H ;;
 	esac
 	case "$setgrent_r_proto" in
-	'')	d_setgrent_r=undef
+	''|0)	d_setgrent_r=undef
  	        setgrent_r_proto=0
 		echo "Disabling setgrent_r, cannot determine prototype." >&4 ;;
 	* )	case "$setgrent_r_proto" in
@@ -14441,6 +14730,8 @@ case "$d_setgrent_r" in
 	*)	case "$usethreads" in
 		define) echo "setgrent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setgrent_r=undef
+		setgrent_r_proto=0
 		;;
 	esac
 	;;
@@ -14458,6 +14749,11 @@ eval $inlibc
 case "$d_sethostent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_sethostent_r_proto:$usethreads" in
 	":define")	d_sethostent_r_proto=define
 		set d_sethostent_r_proto sethostent_r $hdrs
@@ -14475,7 +14771,7 @@ case "$d_sethostent_r" in
 	./protochk "extern $try" $hdrs && sethostent_r_proto=V_ID ;;
 	esac
 	case "$sethostent_r_proto" in
-	'')	d_sethostent_r=undef
+	''|0)	d_sethostent_r=undef
  	        sethostent_r_proto=0
 		echo "Disabling sethostent_r, cannot determine prototype." >&4 ;;
 	* )	case "$sethostent_r_proto" in
@@ -14488,6 +14784,8 @@ case "$d_sethostent_r" in
 	*)	case "$usethreads" in
 		define) echo "sethostent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_sethostent_r=undef
+		sethostent_r_proto=0
 		;;
 	esac
 	;;
@@ -14517,6 +14815,11 @@ eval $inlibc
 case "$d_setlocale_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_locale locale.h"
+	case "locale" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setlocale_r_proto:$usethreads" in
 	":define")	d_setlocale_r_proto=define
 		set d_setlocale_r_proto setlocale_r $hdrs
@@ -14530,7 +14833,7 @@ case "$d_setlocale_r" in
 	./protochk "extern $try" $hdrs && setlocale_r_proto=I_ICBI ;;
 	esac
 	case "$setlocale_r_proto" in
-	'')	d_setlocale_r=undef
+	''|0)	d_setlocale_r=undef
  	        setlocale_r_proto=0
 		echo "Disabling setlocale_r, cannot determine prototype." >&4 ;;
 	* )	case "$setlocale_r_proto" in
@@ -14543,6 +14846,8 @@ case "$d_setlocale_r" in
 	*)	case "$usethreads" in
 		define) echo "setlocale_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setlocale_r=undef
+		setlocale_r_proto=0
 		;;
 	esac
 	;;
@@ -14560,6 +14865,11 @@ eval $inlibc
 case "$d_setnetent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setnetent_r_proto:$usethreads" in
 	":define")	d_setnetent_r_proto=define
 		set d_setnetent_r_proto setnetent_r $hdrs
@@ -14577,7 +14887,7 @@ case "$d_setnetent_r" in
 	./protochk "extern $try" $hdrs && setnetent_r_proto=V_ID ;;
 	esac
 	case "$setnetent_r_proto" in
-	'')	d_setnetent_r=undef
+	''|0)	d_setnetent_r=undef
  	        setnetent_r_proto=0
 		echo "Disabling setnetent_r, cannot determine prototype." >&4 ;;
 	* )	case "$setnetent_r_proto" in
@@ -14590,6 +14900,8 @@ case "$d_setnetent_r" in
 	*)	case "$usethreads" in
 		define) echo "setnetent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setnetent_r=undef
+		setnetent_r_proto=0
 		;;
 	esac
 	;;
@@ -14623,6 +14935,11 @@ eval $inlibc
 case "$d_setprotoent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setprotoent_r_proto:$usethreads" in
 	":define")	d_setprotoent_r_proto=define
 		set d_setprotoent_r_proto setprotoent_r $hdrs
@@ -14640,7 +14957,7 @@ case "$d_setprotoent_r" in
 	./protochk "extern $try" $hdrs && setprotoent_r_proto=V_ID ;;
 	esac
 	case "$setprotoent_r_proto" in
-	'')	d_setprotoent_r=undef
+	''|0)	d_setprotoent_r=undef
  	        setprotoent_r_proto=0
 		echo "Disabling setprotoent_r, cannot determine prototype." >&4 ;;
 	* )	case "$setprotoent_r_proto" in
@@ -14653,6 +14970,8 @@ case "$d_setprotoent_r" in
 	*)	case "$usethreads" in
 		define) echo "setprotoent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setprotoent_r=undef
+		setprotoent_r_proto=0
 		;;
 	esac
 	;;
@@ -14670,6 +14989,11 @@ eval $inlibc
 case "$d_setpwent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_pwd pwd.h"
+	case "pwd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setpwent_r_proto:$usethreads" in
 	":define")	d_setpwent_r_proto=define
 		set d_setpwent_r_proto setpwent_r $hdrs
@@ -14687,7 +15011,7 @@ case "$d_setpwent_r" in
 	./protochk "extern $try" $hdrs && setpwent_r_proto=V_H ;;
 	esac
 	case "$setpwent_r_proto" in
-	'')	d_setpwent_r=undef
+	''|0)	d_setpwent_r=undef
  	        setpwent_r_proto=0
 		echo "Disabling setpwent_r, cannot determine prototype." >&4 ;;
 	* )	case "$setpwent_r_proto" in
@@ -14700,6 +15024,8 @@ case "$d_setpwent_r" in
 	*)	case "$usethreads" in
 		define) echo "setpwent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setpwent_r=undef
+		setpwent_r_proto=0
 		;;
 	esac
 	;;
@@ -14737,6 +15063,11 @@ eval $inlibc
 case "$d_setservent_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_netdb netdb.h"
+	case "netdb" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_setservent_r_proto:$usethreads" in
 	":define")	d_setservent_r_proto=define
 		set d_setservent_r_proto setservent_r $hdrs
@@ -14754,7 +15085,7 @@ case "$d_setservent_r" in
 	./protochk "extern $try" $hdrs && setservent_r_proto=V_ID ;;
 	esac
 	case "$setservent_r_proto" in
-	'')	d_setservent_r=undef
+	''|0)	d_setservent_r=undef
  	        setservent_r_proto=0
 		echo "Disabling setservent_r, cannot determine prototype." >&4 ;;
 	* )	case "$setservent_r_proto" in
@@ -14767,6 +15098,8 @@ case "$d_setservent_r" in
 	*)	case "$usethreads" in
 		define) echo "setservent_r has no prototype, not using it." >&4 ;;
 		esac
+		d_setservent_r=undef
+		setservent_r_proto=0
 		;;
 	esac
 	;;
@@ -15035,6 +15368,11 @@ eval $inlibc
 case "$d_srand48_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "stdlib" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_srand48_r_proto:$usethreads" in
 	":define")	d_srand48_r_proto=define
 		set d_srand48_r_proto srand48_r $hdrs
@@ -15048,7 +15386,7 @@ case "$d_srand48_r" in
 	./protochk "extern $try" $hdrs && srand48_r_proto=I_LS ;;
 	esac
 	case "$srand48_r_proto" in
-	'')	d_srand48_r=undef
+	''|0)	d_srand48_r=undef
  	        srand48_r_proto=0
 		echo "Disabling srand48_r, cannot determine prototype." >&4 ;;
 	* )	case "$srand48_r_proto" in
@@ -15061,6 +15399,8 @@ case "$d_srand48_r" in
 	*)	case "$usethreads" in
 		define) echo "srand48_r has no prototype, not using it." >&4 ;;
 		esac
+		d_srand48_r=undef
+		srand48_r_proto=0
 		;;
 	esac
 	;;
@@ -15074,6 +15414,11 @@ eval $inlibc
 case "$d_srandom_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_stdlib stdlib.h"
+	case "stdlib" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_srandom_r_proto:$usethreads" in
 	":define")	d_srandom_r_proto=define
 		set d_srandom_r_proto srandom_r $hdrs
@@ -15087,7 +15432,7 @@ case "$d_srandom_r" in
 	./protochk "extern $try" $hdrs && srandom_r_proto=I_TS ;;
 	esac
 	case "$srandom_r_proto" in
-	'')	d_srandom_r=undef
+	''|0)	d_srandom_r=undef
  	        srandom_r_proto=0
 		echo "Disabling srandom_r, cannot determine prototype." >&4 ;;
 	* )	case "$srandom_r_proto" in
@@ -15100,6 +15445,8 @@ case "$d_srandom_r" in
 	*)	case "$usethreads" in
 		define) echo "srandom_r has no prototype, not using it." >&4 ;;
 		esac
+		d_srandom_r=undef
+		srandom_r_proto=0
 		;;
 	esac
 	;;
@@ -15512,6 +15859,11 @@ eval $inlibc
 case "$d_strerror_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_string string.h"
+	case "string" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_strerror_r_proto:$usethreads" in
 	":define")	d_strerror_r_proto=define
 		set d_strerror_r_proto strerror_r $hdrs
@@ -15533,7 +15885,7 @@ case "$d_strerror_r" in
 	./protochk "extern $try" $hdrs && strerror_r_proto=B_IBW ;;
 	esac
 	case "$strerror_r_proto" in
-	'')	d_strerror_r=undef
+	''|0)	d_strerror_r=undef
  	        strerror_r_proto=0
 		echo "Disabling strerror_r, cannot determine prototype." >&4 ;;
 	* )	case "$strerror_r_proto" in
@@ -15546,6 +15898,8 @@ case "$d_strerror_r" in
 	*)	case "$usethreads" in
 		define) echo "strerror_r has no prototype, not using it." >&4 ;;
 		esac
+		d_strerror_r=undef
+		strerror_r_proto=0
 		;;
 	esac
 	;;
@@ -15853,6 +16207,24 @@ echo " "
 set d_telldirproto telldir $i_systypes sys/types.h $i_dirent dirent.h
 eval $hasproto
 
+: see if time exists
+echo " "
+if test "X$d_time" = X -o X"$timetype" = X; then
+    if set time val -f d_time; eval $csym; $val; then
+		echo 'time() found.' >&4
+		val="$define"
+		rp="What is the type returned by time() on this system?"
+		set time_t timetype long stdio.h sys/types.h
+		eval $typedef_ask
+    else
+		echo 'time() not found, hope that will do.' >&4
+		val="$undef"
+		timetype='int';
+    fi
+    set d_time
+    eval $setvar
+fi
+
 : see if this is a sys/times.h system
 set sys/times.h i_systimes
 eval $inhdr
@@ -15880,7 +16252,12 @@ set tmpnam_r d_tmpnam_r
 eval $inlibc
 case "$d_tmpnam_r" in
 "$define")
-	hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h"
+	hdrs="$i_systypes sys/types.h define stdio.h "
+	case "stdio" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_tmpnam_r_proto:$usethreads" in
 	":define")	d_tmpnam_r_proto=define
 		set d_tmpnam_r_proto tmpnam_r $hdrs
@@ -15894,7 +16271,7 @@ case "$d_tmpnam_r" in
 	./protochk "extern $try" $hdrs && tmpnam_r_proto=B_B ;;
 	esac
 	case "$tmpnam_r_proto" in
-	'')	d_tmpnam_r=undef
+	''|0)	d_tmpnam_r=undef
  	        tmpnam_r_proto=0
 		echo "Disabling tmpnam_r, cannot determine prototype." >&4 ;;
 	* )	case "$tmpnam_r_proto" in
@@ -15907,6 +16284,8 @@ case "$d_tmpnam_r" in
 	*)	case "$usethreads" in
 		define) echo "tmpnam_r has no prototype, not using it." >&4 ;;
 		esac
+		d_tmpnam_r=undef
+		tmpnam_r_proto=0
 		;;
 	esac
 	;;
@@ -15924,6 +16303,11 @@ eval $inlibc
 case "$d_ttyname_r" in
 "$define")
 	hdrs="$i_systypes sys/types.h define stdio.h $i_unistd unistd.h"
+	case "unistd" in
+	time)
+		hdrs="$hdrs $i_systime sys/time.h"
+		;;
+	esac
 	case "$d_ttyname_r_proto:$usethreads" in
 	":define")	d_ttyname_r_proto=define
 		set d_ttyname_r_proto ttyname_r $hdrs
@@ -15945,7 +16329,7 @@ case "$d_ttyname_r" in
 	./protochk "extern $try" $hdrs && ttyname_r_proto=B_IBI ;;
 	esac
 	case "$ttyname_r_proto" in
-	'')	d_ttyname_r=undef
+	''|0)	d_ttyname_r=undef
  	        ttyname_r_proto=0
 		echo "Disabling ttyname_r, cannot determine prototype." >&4 ;;
 	* )	case "$ttyname_r_proto" in
@@ -15958,6 +16342,8 @@ case "$d_ttyname_r" in
 	*)	case "$usethreads" in
 		define) echo "ttyname_r has no prototype, not using it." >&4 ;;
 		esac
+		d_ttyname_r=undef
+		ttyname_r_proto=0
 		;;
 	esac
 	;;
@@ -18391,24 +18777,6 @@ $rm -f stdioh
 
 
 
-: see if time exists
-echo " "
-if test "X$d_time" = X -o X"$timetype" = X; then
-    if set time val -f d_time; eval $csym; $val; then
-		echo 'time() found.' >&4
-		val="$define"
-		rp="What is the type returned by time() on this system?"
-		set time_t timetype long stdio.h sys/types.h
-		eval $typedef_ask
-    else
-		echo 'time() not found, hope that will do.' >&4
-		val="$undef"
-		timetype='int';
-    fi
-    set d_time
-    eval $setvar
-fi
-
 : see what type uids are declared as in the kernel
 echo " "
 echo "Looking for the type for user ids returned by getuid()."
@@ -19108,9 +19476,7 @@ eval $find_extensions
 # Special case:  Add in threads/shared since it is not picked up by the
 # recursive find above (and adding in general recursive finding breaks
 # SDBM_File/sdbm).  A.D.  10/25/2001.
-# Encode::XX need explicit mentions for the same reason.
-# --jhi 2002-03-04
-known_extensions="$known_extensions threads/shared Encode/CN Encode/JP Encode/KR Encode/TW"
+known_extensions="$known_extensions threads/shared"
 set X $nonxs_extensions
 shift
 nonxs_extensions="$*"
@@ -19335,6 +19701,16 @@ EOM
 	: Exclude those that are not xs extensions
 	case "$dflt" in
 	'')	dflt=none;;
+        *)  case " $dflt " in
+            *" Encode "*) # Add the subextensions of Encode
+                cd "$rsrc/ext"
+                for xxx in `ls Encode/*/Makefile.PL|awk -F/ '{print $2}'`; do
+                        dflt="$dflt Encode/$xxx"
+                done
+                cd "$tdir"
+                ;;
+            esac
+            ;;
 	esac
 	rp="What extensions do you wish to include?"
 	. ./myread