Change 34551 by [EMAIL PROTECTED] on 2008/10/21 18:39:11
Integrate:
[ 34523]
Integrate:
[ 34513]
Suggestion from Slaven - reverse the part of 23348 that removed the
conditional call to dl_expandspec() on platforms that default
$do_expand to false. autorequire, rightly or wrongly, is relying on
being able to set $do_expand to true.
Affected files ...
... //depot/maint-5.8/perl/ext/DynaLoader/DynaLoader_pm.PL#17 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/DynaLoader/DynaLoader_pm.PL#17 (text) ====
Index: perl/ext/DynaLoader/DynaLoader_pm.PL
--- perl/ext/DynaLoader/DynaLoader_pm.PL#16~33812~ 2008-05-10
09:21:04.000000000 -0700
+++ perl/ext/DynaLoader/DynaLoader_pm.PL 2008-10-21 11:39:11.000000000
-0700
@@ -362,9 +362,7 @@
# check for common cases to avoid autoload of dl_findfile
my $try = <<$^O-eq-MacOS>> "$dir:$modfname.$dl_dlext" <<|$^O-eq-MacOS>>
"$dir/$modfname.$dl_dlext"<</$^O-eq-MacOS>>;
- last if $file = <<$^O-eq-VMS>>($do_expand) ? dl_expandspec($try) : ((-f
$try) && $try);
- <<|$^O-eq-VMS>>(-f $try) && $try;
- <</$^O-eq-VMS>>
+ last if $file = ($do_expand) ? dl_expandspec($try) : ((-f $try) &&
$try);
# no luck here, save dir for possible later dl_findfile search
push @dirs, $dir;
End of Patch.
