integrate cfgperl changes into mainline

p4raw-id: //depot/perl@5385

11 files changed, 78 insertions, 15 deletions

diff --git a/Configure b/Configure
index f8bdce86b0..c70242f658 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 Tue Feb 29 19:47:23 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Wed Mar  1 01:33:58 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -650,6 +650,7 @@ i_stddef=''
 i_stdlib=''
 i_string=''
 strings=''
+i_sunmath=''
 i_sysaccess=''
 i_sysdir=''
 i_sysfile=''
@@ -3704,9 +3705,7 @@ case "$libswanted" in
 '') libswanted='c_s';;
 esac
 case "$usesocks" in
-$define)
-	libswanted="$libswanted socks5 socks5_sh"
-	;;
+"$define") libswanted="$libswanted socks5 socks5_sh" ;;
 esac
 libsfound=''
 libsfiles=''
@@ -4414,7 +4413,6 @@ case "$usemorebits" in
 esac
 
 
-# Backward compatibility (uselonglong is deprecated).
 case "$uselonglong" in
 "$define"|true|[yY]*)
 	cat <<EOM >&4
@@ -4424,7 +4422,6 @@ EOM
 	use64bitint="$define"
 	;;
 esac                          
-# Backward compatibility (use64bits is deprecated).
 case "$use64bits" in
 "$define"|true|[yY]*)
 	cat <<EOM >&4
@@ -4434,7 +4431,6 @@ EOM
 	use64bitint="$define"
 	;;
 esac                          
-# Thinko compatibilities.
 case "$use64bitints" in
 "$define"|true|[yY]*)
 	cat <<EOM >&4
@@ -4444,6 +4440,24 @@ EOM
 	use64bitint="$define"
 	;;
 esac                          
+case "$use64bitsint" in
+"$define"|true|[yY]*)
+	cat <<EOM >&4
+
+*** There is no Configure -Duse64bitsint, using -Duse64bitint instead.
+EOM
+	use64bitint="$define"
+	;;
+esac                          
+case "$uselonglongs" in
+"$define"|true|[yY]*)
+	cat <<EOM >&4
+
+*** There is no Configure -Duselonglongs, using -Duse64bitint instead.
+EOM
+	use64bitint="$define"
+	;;
+esac                          
 case "$use64bitsall" in
 "$define"|true|[yY]*)
 	cat <<EOM >&4
@@ -14359,6 +14373,10 @@ $rm -f varargs*
 set stddef.h i_stddef
 eval $inhdr
 
+: see if this is a sunmath.h system
+set sunmath.h i_sunmath
+eval $inhdr
+
 : see if sys/access.h is available
 set sys/access.h i_sysaccess
 eval $inhdr
@@ -15234,6 +15252,7 @@ i_stdarg='$i_stdarg'
 i_stddef='$i_stddef'
 i_stdlib='$i_stdlib'
 i_string='$i_string'
+i_sunmath='$i_sunmath'
 i_sysaccess='$i_sysaccess'
 i_sysdir='$i_sysdir'
 i_sysfile='$i_sysfile'
diff --git a/config_h.SH b/config_h.SH
index 07fbc0315b..9d3ec3d4e5 100644
--- a/config_h.SH
+++ b/config_h.SH
@@ -2370,6 +2370,12 @@ sed <<!GROK!THIS! >config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un-
  */
 #$i_socks	I_SOCKS		/**/
 
+/* I_SUNMATH:
+ *	This symbol, if defined, indicates that <sunmath.h> exists and
+ *	should be included.
+ */
+#$i_sunmath	I_SUNMATH		/**/
+
 /* I_SYSLOG:
  *	This symbol, if defined, indicates that <syslog.h> exists and
  *	should be included.
diff --git a/epoc/config.sh b/epoc/config.sh
index e0d7166ab7..7e913d6516 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -440,6 +440,7 @@ i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
 i_sysaccess='undef'
 i_sysdir='undef'
 i_sysfile='undef'
diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index e5970ff2ec..c149ae075a 100644
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -204,7 +204,7 @@ esac
 
 # Fixed in V5.0A.
 case "`/usr/sbin/sizer -v`" in
-*5.0[A-Z]*|*[6-9].[0-9]*)
+*5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*)
 	: ok
 	;;
 *)
@@ -215,9 +215,9 @@ esac
 
 # The off_t is already 8 bytes, so we do have largefileness.
 
+cat > UU/usethreads.cbu <<'EOCBU'
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
-cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
 	# Threads interfaces changed with V4.0.
@@ -243,6 +243,14 @@ $define|true|[yY]*)
 esac
 EOCBU
 
+cat > UU/uselongdouble.cbu <<'EOCBU'
+# This script UU/uselongdouble.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use long doubles.
+case "$uselongdouble" in
+$define|true|[yY]*) d_Gconvert='sprintf((b),"%.*Lg",(n),(x))' ;;
+esac
+EOCBU
+
 #
 # Unset temporary variables no more needed.
 #
diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh
index c1f207474e..a52c88f362 100644
--- a/hints/solaris_2.sh
+++ b/hints/solaris_2.sh
@@ -333,8 +333,8 @@ EOM
 esac
 EOCBU
 
-cat > UU/useuselargefiles.cbu <<'EOCBU'
-# This script UU/useuselargefiles.cbu will get 'called-back' by Configure 
+cat > UU/uselargefiles.cbu <<'EOCBU'
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use large files.
 case "$uselargefiles" in
 ''|$define|true|[yY]*)
@@ -373,12 +373,12 @@ case "$use64bitall" in
 		# I don't know what are the flags to make gcc sparcv9-aware,
 	        # I'm just guessing. --jhi
 		ccflags="$ccflags -mv9"
-		ldflags="$ccflags -mv9"
+		ldflags="$ldflags -mv9"
 		lddlflags="$lddlflags -G -mv9"
 		;;
 	    *)
 		ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
-		ldflags="$ccflags `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+		ldflags="$ldflags `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
 		lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
 		;;
 	    esac	
@@ -392,7 +392,6 @@ Cannot continue, aborting.
 EOM
 		exit 1
 	    fi 
-	    loclibpth="$loclibpth /usr/lib/sparcv9"
 	    libscheck='case "`/usr/bin/file $xxx`" in
 *64-bit*|*SPARCV9*) ;;
 *) xxx=/no/64-bit$xxx ;;
@@ -402,13 +401,33 @@ esac
 EOCBU
  
 # Actually, we want to run this already now, if so requested,
-# because we need to fix up the library paths right now.
+# because we need to fix up the flags right now.
 case "$use64bitall" in
 "$define"|true|[yY]*)
 	. ./UU/use64bitall.cbu
 	;;
 esac
 
+cat > UU/uselongdouble.cbu <<'EOCBU'
+# This script UU/uselongdouble.cbu will get 'called-back' by Configure 
+# after it has prompted the user for whether to use long doubles.
+case "$uselongdouble" in
+"$define"|true|[yY]*)
+	if test ! -f /opt/SUNWspro/lib/libsunmath.so; then
+		cat <<EOM
+
+I do not see the libsunmath.so in /opt/SUNWspro/lib;
+therefore I cannot do long doubles, sorry.
+
+EOM
+		exit 1
+	fi
+	libswanted="$libswanted sunmath"
+	loclibpth="$loclibpth /opt/SUNWspro/lib"
+	;;
+esac
+EOCBU
+
 # This is just a trick to include some useful notes.
 cat > /dev/null <<'End_of_Solaris_Notes'
 
diff --git a/perl.h b/perl.h
index 6bf8809498..fb48cdbdab 100644
--- a/perl.h
+++ b/perl.h
@@ -1135,7 +1135,11 @@ typedef UVTYPE UV;
 
 typedef NVTYPE NV;
 
+
 #ifdef USE_LONG_DOUBLE
+#   ifdef I_SUNMATH
+#       include <sunmath.h>
+#   endif
 #   define NV_DIG LDBL_DIG
 #   ifdef HAS_SQRTL
 #       define Perl_modf modfl
diff --git a/vms/subconfigure.com b/vms/subconfigure.com
index 6f7c4a09df..585ab643d3 100644
--- a/vms/subconfigure.com
+++ b/vms/subconfigure.com
@@ -72,6 +72,7 @@ $ perl_d_sqrtl = "define"
 $ perl_d_statfs_f_flags = "undef"
 $ perl_d_statfs_s = "undef"
 $ perl_d_ustat = "undef"
+$ perl_i_sunmath = "undef"
 $ perl_i_sysstatfs = "undef"
 $ perl_i_sysvfs = "undef"
 $ perl_i_ustat = "undef"
@@ -4008,6 +4009,7 @@ $ WC "d_gethname='" + perl_d_gethname + "'"
 $ WC "d_phostname='" + perl_d_phostname + "'"
 $ WC "d_accessx='" + perl_d_accessx + "'"
 $ WC "d_eaccess='" + perl_d_eaccess + "'"
+$ WC "i_sunmath='" + perl_i_sunmath + "'"
 $ WC "i_sysaccess='" + perl_i_sysaccess + "'"
 $ WC "i_syssecrt='" + perl_i_syssecrt + "'"
 $ WC "d_fd_set='" + perl_d_fd_set + "'"
diff --git a/vos/config.def b/vos/config.def
index bc294dc25e..c943b73e24 100644
--- a/vos/config.def
+++ b/vos/config.def
@@ -324,6 +324,7 @@ $i_stdarg='define'
 $i_stddef='define'
 $i_stdlib='define'
 $i_string='define'
+$i_sunmath='undef'
 $i_sysaccess='undef'
 $i_sysdir='undef'
 $i_sysfile='undef'
diff --git a/win32/config.bc b/win32/config.bc
index 19ce10d45b..737e0e2052 100644
--- a/win32/config.bc
+++ b/win32/config.bc
@@ -452,6 +452,7 @@ i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
 i_sysaccess='undef'
 i_sysdir='undef'
 i_sysfile='undef'
diff --git a/win32/config.gc b/win32/config.gc
index b6a4175fde..9aab8e0c73 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -452,6 +452,7 @@ i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
 i_sysaccess='undef'
 i_sysdir='undef'
 i_sysfile='undef'
diff --git a/win32/config.vc b/win32/config.vc
index 354f9befa2..5203ed3d7e 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -452,6 +452,7 @@ i_stdarg='define'
 i_stddef='define'
 i_stdlib='define'
 i_string='define'
+i_sunmath='undef'
 i_sysaccess='undef'
 i_sysdir='undef'
 i_sysfile='undef'