Change 34513 by [EMAIL PROTECTED] on 2008/10/18 21:20:19

        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/perl/ext/DynaLoader/DynaLoader_pm.PL#45 edit

Differences ...

==== //depot/perl/ext/DynaLoader/DynaLoader_pm.PL#45 (text) ====
Index: perl/ext/DynaLoader/DynaLoader_pm.PL
--- perl/ext/DynaLoader/DynaLoader_pm.PL#44~33609~      2008-03-30 
16:19:29.000000000 -0700
+++ perl/ext/DynaLoader/DynaLoader_pm.PL        2008-10-18 14:20:19.000000000 
-0700
@@ -336,9 +336,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.

Reply via email to