X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Configure;h=181d2b36ecdf3823e59f7cd996fc53aadc3d41c3;hb=3099fc99273017468e5ddf7177e6764cfc105a6a;hp=b8116b9c362c6e572854470492ac89086913e400;hpb=15b61c98f82f3010e6eaa852f9fa5251de9e6dd9;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Configure b/Configure
index b8116b9..181d2b3 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 Mon Apr 21 10:31:53 EET DST 2003 [metaconfig 3.0 PL70]
+# Generated on Wed May  7 23:33:48 EET DST 2003 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -3195,7 +3195,8 @@ EOM
 			mips)	osname=mips_osf1 ;;
 			esac
 			;;
-		unixware) osname=svr5
+		# UnixWare 7.1.2 is known as Open UNIX 8
+		openunix|unixware) osname=svr5
 			osvers="$4"
 			;;
 		uts)	osname=uts
@@ -5692,6 +5693,10 @@ $define)
         esac
 	;;
 esac
+if $test -f archname.cbu; then
+	echo "Your platform has some specific hints for architecture name, using them..."
+	. ./archname.cbu
+fi
 
 : determine root of directory hierarchy where package will be installed.
 case "$prefix" in
@@ -14042,6 +14047,10 @@ esac
 set sqrtl d_sqrtl
 eval $inlibc
 
+: see if scalbnl exists
+set scalbnl d_scalbnl
+eval $inlibc
+
 : see if modfl exists
 set modfl d_modfl
 eval $inlibc
@@ -14115,32 +14124,31 @@ EOCP
 esac
 
 if $test "$uselongdouble" = "$define"; then
-    message=none
-    case "$d_sqrtl:$d_modfl" in
-    $define:$define)
-	: You have both
-	;;
-    $define:$undef)
+    message=""
+    if $test "$d_sqrtl" != "$define"; then
+	message="$message sqrtl"
+    fi
+    if $test "$d_modfl" != "$define"; then
 	if $test "$d_aintl:$d_copysignl" = "$define:$define"; then
 	    echo "You have both aintl and copysignl, so I can emulate modfl."
 	else
-	    message="I could not find modfl."
+	    message="$message modfl"
 	fi
-	;;
-    $undef:$define)
-	message="I could not find sqrtl."
-	;;
-    $undef:$undef)
-	message="I found neither sqrtl nor modfl."
-	;;
-    esac
+    fi
+    if $test "$d_frexpl" != "$define"; then
+	if $test "$d_ilogbl:$d_scalbnl" = "$define:$define"; then
+	    echo "You have both ilogbl and scalbnl, so I can emulate frexpl."
+	else
+	    message="$message frexpl"
+	fi
+    fi
 
-    if $test "$message" != none; then
+    if $test "$message" != ""; then
 	$cat <<EOM >&4
 
 *** You requested the use of long doubles but you do not seem to have
-*** the mathematic functions for long doubles.
-*** ($message)
+*** the following mathematical functions needed for long double support:
+***    $message
 *** Please rerun Configure without -Duselongdouble and/or -Dusemorebits.
 *** Cannot continue, aborting.
 
@@ -15173,10 +15181,6 @@ echo " "
 set d_sbrkproto sbrk $i_unistd unistd.h
 eval $hasproto
 
-: see if scalbnl exists
-set scalbnl d_scalbnl
-eval $inlibc
-
 : see if select exists
 set select d_select
 eval $inlibc
@@ -17225,9 +17229,9 @@ esac
 : set the base revision
 baserev=5.0
 
-: how do we catenate cpp tokens here?
+: how do we concatenate cpp tokens here?
 echo " "
-echo "Checking to see how your cpp does stuff like catenate tokens..." >&4
+echo "Checking to see how your cpp does stuff like concatenate tokens..." >&4
 $cat >cpp_stuff.c <<'EOCP'
 #define RCAT(a,b)a/**/b
 #define ACAT(a,b)a ## b
@@ -17246,8 +17250,8 @@ elif $contains 'Reiser' cpp_stuff.out >/dev/null 2>&1; then
 	cpp_stuff=1
 else
 	$cat >&4 <<EOM
-Hmm, I don't seem to be able to catenate tokens with your cpp.  You're going
-to have to edit the values of CAT[2-5] in config.h...
+Hmm, I don't seem to be able to concatenate tokens with your cpp.
+You're going to have to edit the values of CAT[2-5] in config.h...
 EOM
 	cpp_stuff="/* Help! How do we handle cpp_stuff? */*/"
 fi
@@ -20114,6 +20118,39 @@ set X $avail_ext
 shift
 avail_ext="$*"
 
+case "$onlyextensions" in
+'') ;;
+*)  keepextensions=''
+    echo "You have requested that only certains extensions be included..." >&4
+    for i in $onlyextensions; do
+        case " $avail_ext " in
+        *" $i "*)
+            echo "Keeping extension $i."
+            keepextensions="$keepextensions $i"
+            ;;
+        *) echo "Ignoring extension $i." ;;
+        esac
+    done
+    avail_ext="$keepextensions"
+    ;;
+esac
+
+case "$noextensions" in
+'') ;;
+*)  keepextensions=''
+    echo "You have requested that certain extensions be ignored..." >&4
+    for i in $avail_ext; do
+        case " $i " in
+        " $noextensions ") echo "Ignoring extension $i." ;;
+        *) echo "Keeping extension $i.";
+           keepextensions="$keepextensions $i"
+           ;;
+        esac
+    done
+    avail_ext="$keepextensions"
+    ;;
+esac
+
 : Now see which nonxs extensions are supported on this system.
 : For now assume all are.
 nonxs_ext=''
@@ -20266,41 +20303,18 @@ set X $dynamic_ext $static_ext $nonxs_ext
 shift
 extensions="$*"
 
-case "$onlyextensions" in
-'') ;;
-*)  keepextensions=''
-    echo "You have requested that only certains extensions be included..." >&4
-    for i in $onlyextensions; do
-        case " $extensions " in
-        *" $i "*)
-            echo "Keeping extension $i."
-            keepextensions="$keepextensions $i"
-            ;;
-        *) echo "Ignoring extension $i." ;;
-        esac
-    done
-    extensions="$keepextensions"
-    ;;
-esac
-
-case "$noextensions" in
-'') ;;
-*)  keepextensions=''
-    echo "You have requested that certain extensions be ignored..." >&4
-    for i in $extensions; do
-        case " $i " in
-        " $noextensions ") echo "Ignoring extension $i." ;;
-        *) echo "Keeping extension $i.";
-           keepextensions="$keepextensions $i"
-           ;;
-        esac
-    done
-    extensions="$keepextensions"
-    ;;
-esac
-
-case "$extensions" in
-*"_File "*" Fcntl "*" IO "*) ;;
+# Sanity check:  We require an extension suitable for use with
+# AnyDBM_File, as well as Fcntl and IO.  (Failure to have these
+# should show up as failures in the test suite, but it's helpful to
+# catch them now.) The 'extensions' list is normally sorted
+# alphabetically, so we need to accept either
+#    DB_File ... Fcntl ... IO  ....
+# or something like
+#    Fcntl ... NDBM_File ... IO  ....
+case " $extensions"  in
+*"_File "*" Fcntl "*" IO "*) ;; # DB_File
+*" Fcntl "*"_File "*" IO "*) ;; # GDBM_File
+*" Fcntl "*" IO "*"_File "*) ;; # NDBM_File
 *) echo "WARNING: Extensions DB_File or *DBM_File, Fcntl, and IO not configured." >&4
    echo "WARNING: The Perl you are building will be quite crippled." >& 4
    ;;