metaconfig unit changes for #19273.

p4raw-id: //depot/metaconfig@19274

diff --git a/U/compline/ptrsize.U b/U/compline/ptrsize.U
index 20603f2..d710a68 100644 (file)
--- a/U/compline/ptrsize.U
+++ b/U/compline/ptrsize.U
@@ -73,21 +73,12 @@ case "$use64bitall" in
        case "$ptrsize" in
        4)      cat <<EOM >&4
 
-*** You have chosen a maximally 64-bit build, but your pointers
-*** are only 4 bytes wide, disabling maximal 64-bitness.
+*** You have chosen a maximally 64-bit build,
+*** but your pointers are only 4 bytes wide.
+*** Cannot continue, aborting.
 
 EOM
-               use64bitall="$undef"
-               case "$use64bitint" in
-               "$define"|true|[yY]*) ;;
-               *)      cat <<EOM >&4
-
-*** Downgrading from maximal 64-bitness to using 64-bit integers.
-
-EOM
-                       use64bitint="$define"
-                       ;;
-               esac
+               exit 1
                ;;
        esac
        ;;

diff --git a/U/perl/d_modfl.U b/U/perl/d_modfl.U
index ffccdd4..e605003 100644 (file)
--- a/U/perl/d_modfl.U
+++ b/U/perl/d_modfl.U
@@ -153,11 +153,12 @@ if $test "$uselongdouble" = "$define"; then
 *** You requested the use of long doubles but you do not seem to have
 *** the mathematic functions for long doubles.
 *** ($message)
-*** I'm disabling the use of long doubles.
+*** Please rerun Configure without -Duselongdouble and/or -Dusemorebits.
+*** Cannot continue, aborting.
 
 EOM
 
-       uselongdouble=$undef
+       exit 1
     fi
 fi
 

diff --git a/U/perl/use64bits.U b/U/perl/use64bits.U
index b3acc6b..5cf26cb 100644 (file)
--- a/U/perl/use64bits.U
+++ b/U/perl/use64bits.U
@@ -250,3 +250,16 @@ case "$use64bitall" in
        ;;
 esac
 
+case "$d_quad:$use64bitint" in
+$undef:$define)
+       cat >&4 <<EOF
+
+*** You have chosen to use 64-bit integers,
+*** but none cannot be found.
+*** Cannot continue, aborting.
+
+EOF
+       exit 1
+       ;;
+esac
+