From: Steffen Mueller <wyp3rlx02@sneakemail.com>
Date: Sun, 1 Jun 2008 17:36:55 +0000 (+0200)
Subject: Fix for lib.pm Config detection
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a811a5cf5ba5b36dcbcd934066ae037d7f53f5ee;p=p5sagit%2Fp5-mst-13.2.git

Fix for lib.pm Config detection
Message-ID: <20080601153657.26607.qmail@lists.develooper.com>

p4raw-id: //depot/perl@33980
---

diff --git a/lib/lib_pm.PL b/lib/lib_pm.PL
index c125708..3332df7 100644
--- a/lib/lib_pm.PL
+++ b/lib/lib_pm.PL
@@ -6,7 +6,7 @@ use Cwd;
 my $origdir = cwd;
 chdir dirname($0);
 my $file = basename($0, '.PL');
-$file =~ s!_(pm)$!.$1!i;
+$file =~ s/_(pm)$/.$1/i;
 
 my $useConfig;
 my $Config_archname;
@@ -31,14 +31,15 @@ else {
   open my $fh, '<', $lib_file
     or die "Could not open file '$lib_file' for reading: $!";
   my $ConfigRegex = qr/(?:use|require)\s+Config(?:\s+|;)/;
+  my $found_config = 0;
   while (defined($_ = <$fh>)) {
     # crude heuristics to check that we were using Config
     if (/^\s*$ConfigRegex/ || /^\s*eval.*$ConfigRegex/) {
-      $expand_config_vars = 0;
+      $found_config = 1;
       last;
     }
   }
-  $expand_config_vars = 1;
+  $expand_config_vars = $found_config ? 0 : 1;
 HERE
   $expand_config_vars = 0 if $@;
 }
@@ -51,7 +52,7 @@ if ($expand_config_vars) {
 	reverse split / /, $Config{inc_version_list};
     $Config_inc_version_list =
 	@Config_inc_version_list ?
-	    qq(@Config_inc_version_list) : q(());
+	    qq(qw(@Config_inc_version_list)) : q(());
 } else {
     $useConfig = 'use Config;';
     $Config_archname = q($Config{archname});