From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 6 Mar 2012 11:45:10 +0000 (+0100)
Subject: maint: resync files from upstream
X-Git-Tag: v2.69~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5edd74e69a2b35441a5fa4e99d7c1942084460d;p=thirdparty%2Fautoconf.git

maint: resync files from upstream

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.
---

diff --git a/lib/Autom4te/Channels.pm b/lib/Autom4te/Channels.pm
index d62a3f0d..1f0fc1ea 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 2db7339e..924b23c5 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 b91f6534..30bbdb92 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 c880e1f3..d73c5ef8 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 bfa6a43d..28d5bc66 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 4cbd5f40..a97e0bd5 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=$@