From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 18 Oct 2008 21:20:19 +0000 (+0000)
Subject: Suggestion from Slaven - reverse the part of 23348 that removed the
X-Git-Tag: accepted/trunk/20130322.191538~12701
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=444c2e40cd0ea36b829c3148c73f26229f0ec7aa;p=platform%2Fupstream%2Fperl.git

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.

p4raw-id: //depot/perl@34513
---

diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index 91fa048..2b833e5 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -336,9 +336,7 @@ sub bootstrap {
 	
 	# 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;