[inseperable differences to perl 5.004_03]perl-5.004_03

[editor's note: the following patches could not be applied from the
list messages.  There are also various unattributed changes.]

  ------  BUILD PROCESS  ------

  Title:  "Configure can stop without fully explaining itself"
   From:  Jim Anderson <jander@ml.com>
 Msg-ID:  <199708111328.JAA28976@nsd15.ny-swaps-develop.ml.com>,
          <199708111952.PAA29346@nsd15.ny-swaps-develop.ml.com>
  Files:  Configure

  ------  CORE LANGUAGE  ------

  Title:  "GNU style perl --version (or any other --foo) ignored"
   From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Kenneth Albanowski
          <kjahds@kjahds.com>, Stephen McCamant <alias@mcs.com>
 Msg-ID:  <E0wx8MO-0007BS-00@ursa.cus.cam.ac.uk>,
          <Pine.LNX.3.93.970813122557.9443C-100000@kjahds.com>,
          <m0wy8nl-000EYgC@alias-2.pr.mcs.net>
  Files:  pod/perldiag.pod perl.c

  ------  DOCUMENTATION  ------

  Title:  "perlop pod inconsistent in presentation of regexp options"
   From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Hans Mulder <hansm@icgned.nl>,
          jmr@whirlwind.fmr.com
 Msg-ID:  <199708061404.KAA06717@whirlwind.fmr.com>,
          <199708081505.LAA09810@whirlwind.fmr.com>,
          <1997Aug7.160530.2196011@hmivax.humgen.upenn.edu>,
          <E0wwnqc-00057s-00@ursa.cus.cam.ac.uk>,
          <E0wwswg-00017x-00@ursa.cus.cam.ac.uk>
  Files:  pod/perlop.pod

  [ 2 messages had applied changes,
    d1a7f0f436d72614358862f92db9613296be2744 and
    b7e30b65e77616e7336a6cda54d9c3d5935d0cfc ]

  ------  PORTABILITY - WIN32  ------

  Title:  "[PATCH] Win95-proofing pl2bat"
   From:  Gurusamy Sarathy <gsar@engin.umich.edu>
 Msg-ID:  <199708121733.NAA14888@aatma.engin.umich.edu>
  Files:  win32/bin/*.bat

  [ d444a43172237b6bdd9f0a52017be3b0d792aa5c didn't apply the deletion
    patches, so the deletes in this commit are a carried error ]

  ------  PORTABILITY - OTHER  ------

  Title:  "5.004_02 Configure - worrying but normal errors displayed to user"
   From:  Paul Marquess <pmarquess@bfsec.bt.co.uk>, pmarquess@bfsec.bt.co.uk
          (Paul Marquess)
 Msg-ID:  <01BCA3DE.E257BFC0.pmarquess@bfsec.bt.co.uk>,
          <9708102159.AA11726@claudius.bfsec.bt.co.uk>
  Files:  Configure os2/diff.configure

  [ one patch found, see 61167c6fd6d55c5f975404dcb56c3d0a87cd2c21 ]

  Title:  "Minor glitch with Perl 5.004_01 on SunOS 4.1.3 (groupstype)"
   From:  thad@thadlabs.com (Thad Floryan)
 Msg-ID:  <9708111415.AA03808@thadlabs.com>
  Files:  hints/sunos_4_1.sh

1 files changed, 26 insertions, 17 deletions

diff --git a/t/pragma/locale.t b/t/pragma/locale.t
index d4b73b8f91..e1ec5a800f 100755
--- a/t/pragma/locale.t
+++ b/t/pragma/locale.t
@@ -395,10 +395,14 @@ for (map { chr } 0..255) {
 print "ok 101\n";
 
 # The @Locale should be internally consistent.
+# Thanks to Hallvard Furuseth <h.b.furuseth@usit.uio.no>
+# for inventing a way to test for ordering consistency
+# without requiring any particular order.
+# ++$jhi;#@iki.fi
 
 print "# testing 102\n";
 {
-    my ($from, $to, $lesser, $greater, @test, %test, $test);
+    my ($from, $to, $lesser, $greater, @test, %test, $test, $yes, $no, $sign);
 
     for (0..9) {
 	# Select a slice.
@@ -410,24 +414,25 @@ print "# testing 102\n";
 	$from++; $to++;
         $to = $#Locale if ($to > $#Locale);
 	$greater = join('', @Locale[$from..$to]);
+	($yes, $no, $sign) = ($lesser lt $greater
+				? ("    ", "not ", 1)
+				: ("not ", "    ", -1));
+	# all these tests should FAIL (return 0).
 	@test = 
 	    (
-	     'not ($lesser  lt $greater)', # 0
-	     'not ($lesser  le $greater)', # 1
-	     'not ($lesser  ne $greater)', # 2
-	     '    ($lesser  eq $greater)', # 3
-	     '    ($lesser  ge $greater)', # 4
-	     '    ($lesser  gt $greater)', # 5
-	     '    ($greater lt $lesser )', # 6
-	     '    ($greater le $lesser )', # 7
-	     'not ($greater ne $lesser )', # 8
-	     '    ($greater eq $lesser )', # 9
-	     'not ($greater ge $lesser )', # 10
-	     'not ($greater gt $lesser )', # 11
-	     # Well, these two are sort of redundant
-	     # because @Locale was derived using cmp.
-	     'not (($lesser  cmp $greater) == -1)', # 12
-	     'not (($greater cmp $lesser ) ==  1)'  # 13
+	     $no.'    ($lesser  lt $greater)',  # 0
+	     $no.'    ($lesser  le $greater)',  # 1
+	     $no.'    ($lesser  ne $greater)',  # 2
+	     $yes.'    ($lesser  eq $greater)', # 3
+	     $yes.'    ($lesser  ge $greater)', # 4
+	     $yes.'    ($lesser  gt $greater)', # 5
+	     $yes.'    ($greater lt $lesser )', # 6
+	     $yes.'    ($greater le $lesser )', # 7
+	     $no.'     ($greater ne $lesser )', # 8
+	     $yes.'    ($greater eq $lesser )', # 9
+	     $no.'     ($greater ge $lesser )', # 10
+	     $no.'     ($greater gt $lesser )', # 11
+	     'not (($lesser cmp $greater) == -$sign)' # 12
 	     );
 	@test{@test} = 0 x @test;
 	$test = 0;
@@ -436,6 +441,8 @@ print "# testing 102\n";
 	    print "# failed 102 at:\n";
 	    print "# lesser  = '$lesser'\n";
 	    print "# greater = '$greater'\n";
+	    print "# lesser cmp greater = ", $lesser cmp $greater, "\n";
+	    print "# greater cmp lesser = ", $greater cmp $lesser, "\n";
 	    print "# (greater) from = $from, to = $to\n";
 	    for my $ti (@test) {
 		printf("# %-40s %-4s", $ti,
@@ -452,3 +459,5 @@ print "# testing 102\n";
     }
 }
 print "ok 102\n";
+
+# eof