Regularize the use* questions, and replace

"Configure *must* be run with -Duse..." with.
"can be run".

p4raw-id: //depot/metaconfig@5120

diff --git a/U/perl/use64bits.U b/U/perl/use64bits.U
index e73de6f..90e4f8a 100644 (file)
--- a/U/perl/use64bits.U
+++ b/U/perl/use64bits.U
@@ -57,7 +57,7 @@ EOM
 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.
+on some systems.  To do so, Configure can be run with -Duse64bits.
 
 If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM

diff --git a/U/perl/uselfs.U b/U/perl/uselfs.U
index 431bae6..5eafcd5 100644 (file)
--- a/U/perl/uselfs.U
+++ b/U/perl/uselfs.U
@@ -37,17 +37,17 @@ case "$lseeksize:$fpossize" in
 You can have files larger than 2 gigabytes.
 EOM
    val="$define" ;;
-*) cat <<EOM
+*)    case "$uselargefiles" in
+   "$undef"|false|[nN]*) dflt='n' ;;
+   *)  dflt='y' ;;
+   esac
+   cat <<EOM
 
 Perl can be built to understand large files (files larger than 2 gigabytes)
-on some systems.  To do so, Configure must be run with -Duselargefiles.
+on some systems.  To do so, Configure can be run with -Duselargefiles.
 
-If this doesn't make any sense to you, just accept the default 'y'.
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-   case "$uselargefiles" in
-   "$undef"|false|[nN]*) dflt='n' ;;
-   *)  dflt='y' ;;
-   esac
    rp='Try to understand large files, if available?'
    . ./myread
    case "$ans" in

diff --git a/U/perl/uselongdbl.U b/U/perl/uselongdbl.U
index 31860a0..e937627 100644 (file)
--- a/U/perl/uselongdbl.U
+++ b/U/perl/uselongdbl.U
@@ -26,14 +26,6 @@
 ?LINT:use usemorebits
 ?LINT:use uselargefiles
 ?F:!uselongdouble.cbu
-cat <<EOM
-
-Perl can be built to take advantage of long doubles which
-(if available) may give more accuracy and range for floating point numbers.
-
-If this doesn't make any sense to you, just accept the default 'n'.
-EOM
-
 case "$ccflags" in
 *-DUSE_LONG_DOUBLE*|*-DUSE_MORE_BITS*) uselongdouble="$define" ;;
 esac
@@ -42,6 +34,13 @@ case "$uselongdouble" in
 $define|true|[yY]*)    dflt='y';;
 *) dflt='n';;
 esac
+cat <<EOM
+
+Perl can be built to take advantage of long doubles which
+(if available) may give more accuracy and range for floating point numbers.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
+EOM
 rp='Try to use long doubles if available?'
 . ./myread
 case "$ans" in

diff --git a/U/perl/usemultiplicity.U b/U/perl/usemultiplicity.U
index 55f81ff..354240e 100644 (file)
--- a/U/perl/usemultiplicity.U
+++ b/U/perl/usemultiplicity.U
@@ -37,12 +37,11 @@ This multiple interpreter support is required for interpreter-based threads.
 EOM
        val="$define"
        ;;
-*)
-       echo 'Normally you do not need this and you should answer no.'
-       case "$usemultiplicity" in
+*)     case "$usemultiplicity" in
        $define|true|[yY]*)     dflt='y';;
        *) dflt='n';;
        esac
+       echo "If this doesn't make any sense to you, just accept the default '$dflt'."
        rp='Build Perl for multiplicity?'
        . ./myread
        case "$ans" in

diff --git a/U/perl/useperlio.U b/U/perl/useperlio.U
index 9254237..8abaa9e 100644 (file)
--- a/U/perl/useperlio.U
+++ b/U/perl/useperlio.U
@@ -25,6 +25,10 @@
 ?H:?%<:#endif
 ?H:.
 ?LINT:set useperlio
+case "$useperlio" in
+$define|true|[yY]*)    dflt='y';;
+*) dflt='n';;
+esac
 cat <<EOM
 
 Previous version of $package used the standard IO mechanisms as defined
@@ -35,12 +39,8 @@ have sfio installed) or regular stdio.  Using PerlIO with sfio may cause
 problems with some extension modules.  Using PerlIO with stdio is safe,
 but it is slower than plain stdio and therefore is not the default.
 
-If this doesn't make any sense to you, just accept the default 'n'.
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-case "$useperlio" in
-$define|true|[yY]*)    dflt='y';;
-*) dflt='n';;
-esac
 rp='Use the experimental PerlIO abstraction layer?'
 . ./myread
 case "$ans" in

diff --git a/U/perl/usesocks.U b/U/perl/usesocks.U
index c99eea4..6f74f7d 100644 (file)
--- a/U/perl/usesocks.U
+++ b/U/perl/usesocks.U
@@ -24,18 +24,17 @@
 ?INIT:: set usesocks on the Configure command line to enable socks.
 ?X: We should really have some explanatory text here, and some
 ?X: automatic setting of sensible defaults.
+case "$usesocks" in
+$define|true|[yY]*)    dflt='y';;
+*) dflt='n';;
+esac
 cat <<EOM
 
 Perl can be built to use the SOCKS proxy protocol library.  To do so,
 Configure must be run with -Dusesocks.
 
-Normally you do not need this and you should answer no.
-
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-case "$usesocks" in
-$define|true|[yY]*)    dflt='y';;
-*) dflt='n';;
-esac
 rp='Build Perl for SOCKS?'
 . ./myread
 case "$ans" in

diff --git a/U/threads/usethreads.U b/U/threads/usethreads.U
index 1049ea2..3aaf2c2 100644 (file)
--- a/U/threads/usethreads.U
+++ b/U/threads/usethreads.U
@@ -64,21 +64,23 @@
 ?F:!usethreads.cbu
 ?X: We should really have some explanatory text here, and some
 ?X: automatic setting of sensible defaults.
+case "$usethreads" in
+$define|true|[yY]*)     dflt='y';;
+*) dflt='n';;
+esac
 cat <<EOM
 
 Perl can be built to take advantage of threads on some systems.
-To do so, Configure must be run with -Dusethreads.
+To do so, Configure can be run with -Dusethreads.
 
 Note that threading is a highly experimental feature, and
 some known race conditions still remain.  If you choose to try
 it, be very sure to not actually deploy it for production
 purposes.  README.threads has more details, and is required
 reading if you enable threads.
+
+If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
-case "$usethreads" in
-$define|true|[yY]*)     dflt='y';;
-*) dflt='n';;
-esac
 rp='Build a threading Perl?'
 . ./myread
 case "$ans" in