summaryrefslogtreecommitdiff
path: root/ext/DynaLoader/DynaLoader_pm.PL
diff options
context:
space:
mode:
Diffstat (limited to 'ext/DynaLoader/DynaLoader_pm.PL')
-rw-r--r--ext/DynaLoader/DynaLoader_pm.PL16
1 files changed, 12 insertions, 4 deletions
diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index 5c14cccc8d..49d449976a 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -88,7 +88,7 @@ package DynaLoader;
# Tim.Bunce@ig.co.uk, August 1994
BEGIN {
- $VERSION = '1.47';
+ $VERSION = '1.47_01';
}
EOT
@@ -502,12 +502,20 @@ sub dl_findfile {
foreach $name (@names) {
my($file) = "$dir$dirsep$name";
print STDERR " checking in $dir for $name\n" if $dl_debug;
- $file = ($do_expand) ? dl_expandspec($file) : (-f $file && $file);
- #$file = _check_file($file);
- if ($file) {
+ if ($do_expand && ($file = dl_expandspec($file))) {
+ push @found, $file;
+ next arg; # no need to look any further
+ }
+ elsif (-f $file) {
push(@found, $file);
next arg; # no need to look any further
}
+ <<$^O-eq-darwin>>
+ elsif (dl_load_file($file, 0)) {
+ push @found, $file;
+ next arg; # no need to look any further
+ }
+ <</$^O-eq-darwin>>
}
}
}