Fix C<require> in Getopt::Long to work with 5.003

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

diff --git a/configpm b/configpm
index 3cef56d..f160177 100755 (executable)
--- a/configpm
+++ b/configpm
@@ -6,7 +6,7 @@ $config_pm = $ARGV[0] || 'lib/Config.pm';
 # list names to put first (and hence lookup fastest)
 @fast = qw(archname osname osvers prefix libs libpth
        dynamic_ext static_ext extensions dlsrc so
-       sig_name cc ccflags cppflags
+       sig_name sig_num cc ccflags cppflags
        privlibexp archlibexp installprivlib installarchlib
        sharpbang startsh shsharp
 );
@@ -39,19 +39,23 @@ ENDOFBEG
 @non_v=();
 @v_fast=();
 @v_others=();
+$in_v = 0;
 
 while (<>) {
     next if m:^#!/bin/sh:;
     # Catch CONFIG=true and PATCHLEVEL=n line from Configure.
     s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/;
-    unless (m/^(\w+)='(.*)'\s*$/){
+    unless ($in_v or m/^(\w+)='(.*\n)/){
        push(@non_v, "#$_"); # not a name='value' line
        next;
     }
-    $name = $1;
+    if ($in_v) { $val .= $_;             }
+    else       { ($name,$val) = ($1,$2); }
+    $in_v = $val !~ /'\n/;
+    next if $in_v;
     if ($extensions{$name}) { s,/,::,g }
-    if (!$fast{$name}){ push(@v_others, $_); next; }
-    push(@v_fast,$_);
+    if (!$fast{$name}){ push(@v_others, "$name='$val"); next; }
+    push(@v_fast,"$name='$val");
 }
 
 foreach(@non_v){ print CONFIG $_ }
@@ -99,7 +103,7 @@ sub FETCH {
     if ($start == -1) { $start = length($marker) } 
         else { $start += length($marker) + 1 }
     $value = substr($config_sh, $start, 
-        index($config_sh, q('), $start) - $start);
+        index($config_sh, qq('\n), $start) - $start);
  
     $value = undef if $value eq 'undef'; # So we can say "if $Config{'foo'}".
     $_[0]->{$_[1]} = $value; # cache it
@@ -116,7 +120,7 @@ sub FIRSTKEY {
 }
 
 sub NEXTKEY {
-    my $pos = index($config_sh, "\n", $prevpos) + 1;
+    my $pos = index($config_sh, qq('\n), $prevpos) + 2;
     my $len = index($config_sh, "=", $pos) - $pos;
     $prevpos = $pos;
     $len > 0 ? substr($config_sh, $pos, $len) : undef;
@@ -241,17 +245,23 @@ See also C<-V:name> in L<perlrun/Switches>.
 Here's a more sophisticated example of using %Config:
 
     use Config;
+    use strict;
+
+    my %sig_num;
+    my @sig_name;
+    unless($Config{sig_name} && $Config{sig_num}) {
+       die "No sigs?";
+    } else {
+       my @names = split ' ', $Config{sig_name};
+       @sig_num{@names} = split ' ', $Config{sig_num};
+       foreach (@names) {
+           $sig_name[$sig_num{$_}] ||= $_;
+       }   
+    }
 
-    defined $Config{sig_name} || die "No sigs?";
-    foreach $name (split(' ', $Config{sig_name})) {
-       $signo{$name} = $i;
-       $signame[$i] = $name;
-       $i++;
-    }   
-
-    print "signal #17 = $signame[17]\n";
-    if ($signo{ALRM}) { 
-       print "SIGALRM is $signo{ALRM}\n";
+    print "signal #17 = $sig_name[17]\n";
+    if ($sig_num{ALRM}) { 
+       print "SIGALRM is $sig_num{ALRM}\n";
     }   
 
 =head1 WARNING