[inseparable changes from match from perl-5.003_96 to perl-5.003_97]

 CORE LANGUAGE CHANGES

Subject: Reenable but deprecate inherited AUTOLOAD for plain funcs
From: Chip Salzenberg <chip@perl.com>
Files: ext/DynaLoader/DynaLoader.pm gv.c lib/Text/ParseWords.pm pod/perldelta.pod pod/perldiag.pod t/op/method.t

 CORE PORTABILITY

Subject: Win32 update
Date: Wed, 02 Apr 1997 01:08:09 -0500
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: win32/VC-2.0/modules.mak win32/VC-2.0/perl.mak win32/VC- 2.0/perldll.mak win32/perl.mak
Msg-ID: 199704020608.BAA29538@aatma.engin.umich.edu

    (applied based on p5p patch as commit 8d0ff1118aaee510902477e928a660803304346c)

 DOCUMENTATION

Subject: Clean up some poddities, and make C<make html> work again
From: Chip Salzenberg <chip@perl.com>
Files: pod/Makefile pod/perldelta.pod pod/perldiag.pod pod/perlfaq8.pod pod/perlfunc.pod pod/perlop.pod pod/perltrap.pod

Subject: Eliminate pod warnings in libs
From: Chip Salzenberg <chip@perl.com>
Files: lib/CGI.pm lib/ExtUtils/Command.pm

 LIBRARY AND EXTENSIONS

Subject: Eliminate warning in CGI.pm
From: Chip Salzenberg <chip@perl.com>
Files: lib/CGI.pm

 OTHER CORE CHANGES

Subject: Introduce and use gv_fetchmethod_autoload()
From: Chip Salzenberg <chip@perl.com>
Files: global.sym gv.c pod/perlguts.pod proto.h universal.c

4 files changed, 16 insertions, 9 deletions

diff --git a/lib/CGI.pm b/lib/CGI.pm
index 3ddd4d999b..4651e138a3 100644
--- a/lib/CGI.pm
+++ b/lib/CGI.pm
@@ -29,7 +29,7 @@ $AUTOLOAD_DEBUG=0;
 $NPH=0;
 
 $CGI::revision = '$Id: CGI.pm,v 2.32 1997/3/19 10:10 lstein Exp $';
-$CGI::VERSION='2.32';
+$CGI::VERSION='2.3201';
 
 # OVERRIDE THE OS HERE IF CGI.pm GUESSES WRONG
 # $OS = 'UNIX';
@@ -87,7 +87,9 @@ $SL = {
 $NPH++ if defined($ENV{'SERVER_SOFTWARE'}) && $ENV{'SERVER_SOFTWARE'}=~/IIS/;
 
 # Turn on special checking for Doug MacEachern's modperl
-if ($MOD_PERL = $ENV{'GATEWAY_INTERFACE'} =~ /^CGI-Perl/) {
+if (defined($MOD_PERL = $ENV{'GATEWAY_INTERFACE'}) &&
+    $MOD_PERL =~ /^CGI-Perl/)
+{
     $NPH++;
     $| = 1;
     $SEQNO = 1;
@@ -2697,6 +2699,11 @@ __END__
 
 CGI - Simple Common Gateway Interface Class
 
+=head1 SYNOPSIS
+
+  use CGI;
+  # the rest is too complicated for a synopsis; keep reading
+
 =head1 ABSTRACT
 
 This perl library uses perl5 objects to make it easy to create
diff --git a/lib/ExtUtils/Command.pm b/lib/ExtUtils/Command.pm
index 7bdbea9dd7..bdf32d4218 100644
--- a/lib/ExtUtils/Command.pm
+++ b/lib/ExtUtils/Command.pm
@@ -16,7 +16,7 @@ $VERSION = '1.00';
 
 ExtUtils::Command - utilities to replace common UNIX commands in Makefiles etc.
 
-=head1 SYNOPSYS
+=head1 SYNOPSIS
 
   perl -MExtUtils::command -e cat files... > destination
   perl -MExtUtils::command -e mv source... destination
diff --git a/lib/Text/ParseWords.pm b/lib/Text/ParseWords.pm
index ce6f0009fc..bd95b4f204 100644
--- a/lib/Text/ParseWords.pm
+++ b/lib/Text/ParseWords.pm
@@ -1,16 +1,16 @@
 package Text::ParseWords;
 
 require 5.000;
-require Exporter;
-require AutoLoader;
 use Carp;
 
-@ISA = qw(Exporter AutoLoader);
+require AutoLoader;
+*AUTOLOAD = \&AutoLoader::AUTOLOAD;
+
+require Exporter;
+@ISA = qw(Exporter);
 @EXPORT = qw(shellwords quotewords);
 @EXPORT_OK = qw(old_shellwords);
 
-*AUTOLOAD = *AutoLoader::AUTOLOAD;
-
 =head1 NAME
 
 Text::ParseWords - parse text into an array of tokens
diff --git a/lib/autouse.pm b/lib/autouse.pm
index e2ef580392..b3adc34549 100644
--- a/lib/autouse.pm
+++ b/lib/autouse.pm
@@ -3,7 +3,7 @@ package autouse;
 #use strict;		# debugging only
 use 5.003_90;		# ->can, for my $var
 
-$autouse::VERSION = '0.03';
+$autouse::VERSION = '1.00';
 
 my $DEBUG = $ENV{AUTOUSE_DEBUG};