Re-introduce #4817 and #4964 wiped out by #4987.

p4raw-id: //depot/metaconfig@4990

diff --git a/U/perl/patchlevel.U b/U/perl/patchlevel.U
index ab6036f..3f774d9 100644 (file)
--- a/U/perl/patchlevel.U
+++ b/U/perl/patchlevel.U
@@ -115,7 +115,7 @@ $echo $n " patchlevel $patchlevel" $c
 test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
 echo ".)"
 case "$osname" in
-dos|cygwin|vms|win32)
+dos|vms)
        : XXX Should be a Configure test for double-dots in filenames.
        version=`echo $baserev $patchlevel $subversion | \
                 $awk '{ printf "%d_%d_%d\n", $1, $2, $3 }'`

diff --git a/U/threads/usethreads.U b/U/threads/usethreads.U
index 1039858..1049ea2 100644 (file)
--- a/U/threads/usethreads.U
+++ b/U/threads/usethreads.U
@@ -66,7 +66,7 @@
 ?X: automatic setting of sensible defaults.
 cat <<EOM
 
-Perl can be built to take advantage of threads, on some systems.
+Perl can be built to take advantage of threads on some systems.
 To do so, Configure must be run with -Dusethreads.
 
 Note that threading is a highly experimental feature, and
@@ -97,6 +97,10 @@ the 5.005 version (5005threads) and an interpreter-based version
 (ithreads) that has one interpreter per thread.  Both are very 
 experimental.  This arrangement exists to help developers work out
 which one is better.
+
+If you're a casual user, you probably don't want interpreter-threads
+at this time.  There doesn't yet exist a way to create threads from
+within Perl in this model, i.e., "use Thread;" will NOT work.
 EOM
        : Default to ithreads unless overridden on command line or with
        : old config.sh