add CGI.pm v2.66 (from Lincoln Stein)

[p5sagit/p5-mst-13.2.git] / lib / lib.pm

diff --git a/lib/lib.pm b/lib/lib.pm
index 879af16..98e2f73 100644 (file)
--- a/lib/lib.pm
+++ b/lib/lib.pm
@@ -3,8 +3,10 @@ package lib;
 use 5.005_64;
 use Config;
 
-my $archname = $Config{'archname'};
-my $ver = $Config{'version'};
+my $archname = defined($Config{'archname'}) ? $Config{'archname'} : '';
+my $ver = defined($Config{'version'}) ? $Config{'version'} : '';
+my @inc_version_list = defined($Config{'inc_version_list'}) ?
+   reverse split / /, $Config{'inc_version_list'} : ();
 
 our @ORIG_INC = @INC;  # take a handy copy of 'original' value
 our $VERSION = '0.5564';
@@ -23,12 +25,15 @@ sub import {
            Carp::carp("Parameter to use lib must be directory, not file");
        }
        unshift(@INC, $_);
+        # Add any previous version directories we found at configure time
+        foreach my $incver (@inc_version_list)
+        {
+            unshift(@INC, "$_/$incver") if -d "$_/$incver";
+        }
        # Put a corresponding archlib directory infront of $_ if it
        # looks like $_ has an archlib directory below it.
-       if (-d "$_/$archname") {
-           unshift(@INC, "$_/$archname")    if -d "$_/$archname/auto";
-           unshift(@INC, "$_/$archname/$ver") if -d "$_/$archname/$ver/auto";
-       }
+       unshift(@INC, "$_/$ver") if -d "$_/$ver";
+       unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname";
     }
 
     # remove trailing duplicates