NetWare update from Ananth Kesari.

p4raw-id: //depot/perl@16922

1 files changed, 16 insertions, 2 deletions

diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index d6e6dc6b65..7e1b8cb6a8 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -234,6 +234,10 @@ sub bootstrap {
     # It may also edit @modparts if required.
     $modfname = &mod2fname(\@modparts) if defined &mod2fname;
 
+	if (($^O eq 'NetWare') && (length($modfname) > 8)) {
+		$modfname = substr($modfname, 0, 8);
+	}
+
     my $modpname = join(($Is_MacOS ? ':' : '/'),@modparts);
 
     print STDERR "DynaLoader::bootstrap for $module ",
@@ -252,11 +256,21 @@ sub bootstrap {
 	} else {
 	    $dir = "$_/auto/$modpname";
 	}
-	next unless -d $dir; # skip over uninteresting directories
+	if ($^O ne 'NetWare') {
+		next unless -d $dir; # skip over uninteresting directories
+	}
+	else {
+		next if -f $dir; # skip over uninteresting directories
+	}
 
 	# check for common cases to avoid autoload of dl_findfile
 	my $try = $Is_MacOS ? "$dir:$modfname.$dl_dlext" : "$dir/$modfname.$dl_dlext";
-	last if $file = ($do_expand) ? dl_expandspec($try) : (-f $try && $try);
+	if ($^O ne 'NetWare') {
+		last if $file = ($do_expand) ? dl_expandspec($try) : ((-f $try) && $try);
+	}
+	elsif (!(-d $try)) {
+		last if $file = ($do_expand) ? dl_expandspec($try) : ($try);
+	}
 
 	# no luck here, save dir for possible later dl_findfile search
 	push @dirs, $dir;