YA sync with mainline

p4raw-id: //depot/vmsperl@5435

diff --cc ext/File/Glob/Glob.pm
index a8e0262,3c3ea6c..cfb44c8
--- 1/ext/File/Glob/Glob.pm
--- 2/ext/File/Glob/Glob.pm
+++ b/ext/File/Glob/Glob.pm
@@@ -109,11 -109,8 +109,11 @@@ if ($^O =~ /^(?:MSWin32|VMS|os2|dos|ris
  # Autoload methods go after =cut, and are processed by the autosplit program.
  
  sub glob {
-     my $pat = shift;
-     my $flags = shift;
+     my ($pat,$flags) = @_;
+     $flags = $DEFAULT_FLAGS if @_ < 2;
 +    if ($^O =~ /^(?:MSWin32|VMS|os2|dos|riscos|MacOS)$/) {
 +        $flags |= GLOB_NOCASE();
 +    }
      return doglob($pat,$flags);
  }
  

diff --cc lib/Test/Harness.pm
index 0bcdb8d,820c661..e98a144
--- 1/lib/Test/Harness.pm
--- 2/lib/Test/Harness.pm
+++ b/lib/Test/Harness.pm
@@@ -68,10 -68,16 +68,15 @@@ sub runtests 
      # VMS has a 255-byte limit on the length of %ENV entries, so
      # toss the ones that involve perl_root, the install location
      # for VMS
-     local($ENV{'PERL5LIB'}) = join($Config{path_sep}, grep {!/perl_root/i;} @INC) if $^O eq 'VMS';
-     local($ENV{'PERL5LIB'}) = join($Config{path_sep}, @INC) unless $^O eq 'VMS';
- 
-     if ($^O eq 'VMS') { $switches =~ s/-(\S*[A-Z]\S*)/"-$1"/g;}
+     my $new5lib;
+     if ($^O eq 'VMS') {
+       $new5lib = join($Config{path_sep}, grep {!/perl_root/i;} @INC);
+       $switches =~ s/-(\S*[A-Z]\S*)/"-$1"/g;
+     }
+     else {
+         $new5lib = join($Config{path_sep}, @INC);
+     }
 -
+     local($ENV{'PERL5LIB'}) = $new5lib;
  
      my @dir_files = globdir $files_in_dir if defined $files_in_dir;
      my $t_start = new Benchmark;

diff --cc perlapi.h
index 8ba6504,70a2187..70a2187
mode 100755,100644..100755
--- 1/perlapi.h
--- 2/perlapi.h
+++ b/perlapi.h

diff --cc vms/subconfigure.com
Simple merge