[PATCH] maint: resync files from upstream

[Stefano Lattarini]

Since the perl version required in Automake::Getopt has been
recently lowered from 5.6.2 to 5.6.0, this change has the nice
effect of making autoconf compatible again with all perls in
the 5.6.x release series.

* maint.mk: Resync via 'make fetch'.
* lib/Autom4te/Channels.pm: Likewise.
* lib/Autom4te/Configure_ac.pm: Likewise.
* lib/Autom4te/FileUtils.pm: Likewise.
* lib/Autom4te/Getopt.pm: Likewise.
* lib/Autom4te/XFile.pm: Likewise.
---

 OK for master, so that it will appear in the upcoming 2.69
 release?

 Thanks,
   Stefano

 lib/Autom4te/Channels.pm     |    2 +-
 lib/Autom4te/Configure_ac.pm |    1 +
 lib/Autom4te/FileUtils.pm    |    1 +
 lib/Autom4te/Getopt.pm       |    2 +-
 lib/Autom4te/XFile.pm        |    2 +-
 maint.mk                     |    2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index d62a3f0..1f0fc1e 100644
--- a/lib/Autom4te/Channels.pm
+++ b/lib/Autom4te/Channels.pm
@@ -66,7 +66,7 @@ etc.) that can also be overridden on a per-message basis.
 
 =cut
 
-use 5.005;
+use 5.006;
 use strict;
 use Exporter;
 use Carp;
diff --git a/lib/Autom4te/Configure_ac.pm b/lib/Autom4te/Configure_ac.pm
index 2db7339..924b23c 100644
--- a/lib/Autom4te/Configure_ac.pm
+++ b/lib/Autom4te/Configure_ac.pm
@@ -20,6 +20,7 @@
 
 package Autom4te::Configure_ac;
 
+use 5.006;
 use strict;
 use Exporter;
 use Autom4te::Channels;
diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm
index b91f653..30bbdb9 100644
--- a/lib/Autom4te/FileUtils.pm
+++ b/lib/Autom4te/FileUtils.pm
@@ -34,6 +34,7 @@ This perl module provides various general purpose file 
handling functions.
 
 =cut
 
+use 5.006;
 use strict;
 use Exporter;
 use File::stat;
diff --git a/lib/Autom4te/Getopt.pm b/lib/Autom4te/Getopt.pm
index c880e1f..d73c5ef 100644
--- a/lib/Autom4te/Getopt.pm
+++ b/lib/Autom4te/Getopt.pm
@@ -30,7 +30,7 @@ line options in conformance to the GNU Coding standards.
 
 =cut
 
-use 5.006_002;
+use 5.006;
 use strict;
 use warnings FATAL => 'all';
 use Exporter ();
diff --git a/lib/Autom4te/XFile.pm b/lib/Autom4te/XFile.pm
index bfa6a43..28d5bc6 100644
--- a/lib/Autom4te/XFile.pm
+++ b/lib/Autom4te/XFile.pm
@@ -69,7 +69,7 @@ and C<getlines> methods to translate C<\r\n> to C<\n>.
 
 =cut
 
-require 5.000;
+use 5.006;
 use strict;
 use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA);
 use Carp;
diff --git a/maint.mk b/maint.mk
index 4cbd5f4..a97e0bd 100644
--- a/maint.mk
+++ b/maint.mk
@@ -1332,7 +1332,7 @@ alpha beta stable: $(local-check) writable-files 
$(submodule-checks)
        $(MAKE) vc-diff-check
        $(MAKE) news-check
        $(MAKE) distcheck
-       $(MAKE) dist XZ_OPT=-9ev
+       $(MAKE) dist
        $(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
        $(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
 
-- 
1.7.9