megalomaniac 64-bit update: most importantly,

[p5sagit/p5-mst-13.2.git] / Configure

diff --git a/Configure b/Configure
index ba95818..24b62ef 100755 (executable)
--- 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 Fri Feb 11 21:50:12 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Sat Feb 12 03:16:21 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -877,7 +877,6 @@ archname64=''
 use64bits=''
 uselargefiles=''
 uselongdouble=''
-uselonglong=''
 usemorebits=''
 usemultiplicity=''
 nm_opt=''
@@ -950,7 +949,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 /lib/pa1.1 /usr/lib/large"
+glibpth="/shlib /usr/shlib /lib/pa20_64 /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"
@@ -3715,9 +3714,6 @@ for thislib in $libswanted; do
                libstyle="static"
        fi
        if $test -f "$xxx"; then
-               eval $libscheck
-       fi
-       if $test -f "$xxx"; then
                case "$libstyle" in
                shared) echo "Found -l$libname (shared)." ;;
                static) echo "Found -l$libname." ;;
@@ -4374,25 +4370,33 @@ case "$intsize:$longsize" in
 
 You have natively 64-bit integers.
 EOM
-   val="$define" ;;
-*) cat <<EOM
+   val="$define"
+   ;;
+*) case "$ccflags" in
+   *-DUSE_64_BITS*|*-DUSE_LONG_LONG*) use64bits="$define";;
+   *) case "$uselonglong" in
+      $define|true|[yY]*) use64bits="$define";;
+      esac
+      ;;
+   esac
+   case "$use64bits" in
+   $define|true|[yY]*) dflt='y';;
+   *) dflt='n';;
+   esac
+cat <<EOM
 
 Perl can be built to take advantage of 64-bit integer types
 on some systems.  To do so, Configure must be run with -Duse64bits.
 
-If this doesn't make any sense to you, just accept the default.
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-  case "$use64bits" in
-  $define|true|[yY]*)  dflt='y';;
-  *) dflt='n';;
-  esac
-  rp='Try to use 64-bit integers, if available?'
-  . ./myread
-  case "$ans" in
-  y|Y) val="$define" ;;
-  *)   val="$undef"  ;;
-  esac
-  ;;
+   rp='Try to use 64-bit integers, if available?'
+   . ./myread
+   case "$ans" in
+   [yY]*) val="$define" ;;
+   *)     val="$undef"  ;;
+   esac
+   ;;
 esac
 set use64bits
 eval $setvar
@@ -7044,49 +7048,6 @@ EOM
        ;;
 esac
 
-case "$uselonglong" in
-''|true|[yY]*) uselonglong="$define" ;;
-*) case "$ccflags" in
-   *-DUSE_LONG_LONG*) uselonglong="$define" ;;
-   *) uselonglong="$undef" ;;
-   esac
-   ;;
-esac
-case "$uselonglong" in
-$define)       dflt='y';;
-*)             dflt='n';;
-esac
-cat <<EOM
-
-Perl can be built to take advantage of long longs which
-(if available) may give more range for integer numbers.
-
-If this doesn't make any sense to you, just accept the default '$dflt'.
-EOM
-rp='Try to use long longs if available?'
-. ./myread
-case "$ans" in
-y|Y)   val="$define"   ;;
-*)      val="$undef"   ;;
-esac
-set uselonglong
-eval $setvar
-case "$uselonglong" in
-$define)
-: Look for a hint-file generated 'call-back-unit'.  If the
-: user has specified that long longs should be used,
-: we may need to set or change some other defaults.
-       if $test -f uselonglong.cbu; then
-               echo "Your platform has some specific hints for long longs, using them..."
-               . ./uselonglong.cbu
-       else
-               $cat <<EOM
-(Your platform doesn't have any specific hints for long longs.)
-EOM
-       fi
-       ;;
-esac
-
 cat <<EOM
 
 Previous version of $package used the standard IO mechanisms as defined
@@ -9656,11 +9617,7 @@ case "$intsize" in
 esac
 
 case "$quadtype" in
-'')    case "$uselonglong:$d_longlong:$longlongsize" in
-       undef:define:8)
-          echo "(You would have 'long long', but you are not using it.)" >&4 ;;
-       *) echo "Alas, no 64-bit integer types in sight." >&4 ;;
-       esac
+'')    echo "Alas, no 64-bit integer types in sight." >&4
        d_quad="$undef"
        ;;
 *)     if test X"$use64bits" = Xdefine -o X"$longsize" = X8; then
@@ -15208,7 +15165,6 @@ usedl='$usedl'
 useithreads='$useithreads'
 uselargefiles='$uselargefiles'
 uselongdouble='$uselongdouble'
-uselonglong='$uselonglong'
 usemorebits='$usemorebits'
 usemultiplicity='$usemultiplicity'
 usemymalloc='$usemymalloc'