support for list assignment to pseudohashes (from John Tobey

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

diff --git a/lib/lib.pm b/lib/lib.pm
index ea3ea5e..e46c5fe 100644 (file)
--- a/lib/lib.pm
+++ b/lib/lib.pm
@@ -1,12 +1,14 @@
 package lib;
 
-use vars qw(@ORIG_INC);
+use 5.005_64;
 use Config;
 
 my $archname = $Config{'archname'};
+my $ver = $Config{'version'};
+my @inc_version_list = reverse split / /, $Config{'inc_version_list'};
 
-@ORIG_INC = @INC;      # take a handy copy of 'original' value
-
+our @ORIG_INC = @INC;  # take a handy copy of 'original' value
+our $VERSION = '0.5564';
 
 sub import {
     shift;
@@ -22,15 +24,20 @@ 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/$]") if -d "$_/$archname/$]/auto";
-       }
-       # remove trailing duplicates
-       @INC = grep { ++$names{$_} == 1 } @INC;
+       unshift(@INC, "$_/$ver") if -d "$_/$ver";
+       unshift(@INC, "$_/$ver/$archname") if -d "$_/$ver/$archname";
     }
+
+    # remove trailing duplicates
+    @INC = grep { ++$names{$_} == 1 } @INC;
+    return;
 }
 
 
@@ -45,6 +52,7 @@ sub unimport {
 
     # Remove ALL instances of each named directory.
     @INC = grep { !exists $names{$_} } @INC;
+    return;
 }
 
 1;