integrate cfgperl contents into mainline

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

diff --git a/lib/ExtUtils/Liblist.pm b/lib/ExtUtils/Liblist.pm
index b992ec0..47ce3dc 100644 (file)
--- a/lib/ExtUtils/Liblist.pm
+++ b/lib/ExtUtils/Liblist.pm
@@ -1,8 +1,9 @@
 package ExtUtils::Liblist;
-use vars qw($VERSION);
+
+use 5.005_64;
 # Broken out of MakeMaker from version 4.11
 
-$VERSION = substr q$Revision: 1.25 $, 10;
+our $VERSION = substr q$Revision: 1.25 $, 10;
 
 use Config;
 use Cwd 'cwd';
@@ -114,7 +115,7 @@ sub _unix_os2_ext {
            } elsif (-f ($fullname="$thispth/Slib$thislib$Config_libext")){
            } elsif ($^O eq 'dgux'
                 && -l ($fullname="$thispth/lib$thislib$Config_libext")
-                && readlink($fullname) =~ /^elink:/) {
+                && readlink($fullname) =~ /^elink:/s) {
                 # Some of DG's libraries look like misconnected symbolic
                 # links, but development tools can follow them.  (They
                 # look like this:
@@ -136,7 +137,7 @@ sub _unix_os2_ext {
            # Now update library lists
 
            # what do we know about this library...
-           my $is_dyna = ($fullname !~ /\Q$Config_libext\E$/);
+           my $is_dyna = ($fullname !~ /\Q$Config_libext\E\z/);
            my $in_perl = ($libs =~ /\B-l\Q$ {thislib}\E\b/s);
 
            # Do not add it into the list if it is already linked in