From b60223c67632fa648c85829a399804e5f815e612 Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 10 May 2006 21:13:22 +0000
Subject: [PATCH] * configure.ac: Recommend perl-5.8.2. * tests/automake.test:
 Do not fail because of buggy Getopt::Long in perl < 5.8.2.

---
 ChangeLog           |  4 ++++
 configure           | 10 ++++++----
 configure.ac        |  9 +++++----
 tests/automake.test |  9 ++++++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70c9fbca7..95a59d8b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* configure.ac: Recommend perl-5.8.2.
+	* tests/automake.test: Do not fail because of buggy Getopt::Long
+	in perl < 5.8.2.
+
 	* tests/longlin2.test: Do not use `grep' on Makefile.am:
 	it has long lines and is thus not a text file; AIX 5.1 grep
 	fails to scan non-plain patterns from long lines.
diff --git a/configure b/configure
index 6f7e2ad61..1f6b40fa8 100755
--- a/configure
+++ b/configure
@@ -2226,11 +2226,13 @@ echo "$as_me: error: perl not found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 $PERL -e 'require 5.006;' || {
-   { { echo "$as_me:$LINENO: error: perl 5.6 or better is required.  If you have several perl
-versions installed, select the one Automake should use using
+   { { echo "$as_me:$LINENO: error: perl 5.6 or better is required; perl 5.8.2 or better
+is recommended.  If you have several perl versions
+installed, select the one Automake should use using
   ./configure PERL=/path/to/perl" >&5
-echo "$as_me: error: perl 5.6 or better is required.  If you have several perl
-versions installed, select the one Automake should use using
+echo "$as_me: error: perl 5.6 or better is required; perl 5.8.2 or better
+is recommended.  If you have several perl versions
+installed, select the one Automake should use using
   ./configure PERL=/path/to/perl" >&2;}
    { (exit 1); exit 1; }; }
 }
diff --git a/configure.ac b/configure.ac
index f709fe950..f61ef248d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+# 2004, 2006  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -58,8 +58,9 @@ if test -z "$PERL"; then
 fi
 $PERL -e 'require 5.006;' || {
    AC_MSG_ERROR(
-[perl 5.6 or better is required.  If you have several perl
-versions installed, select the one Automake should use using
+[perl 5.6 or better is required; perl 5.8.2 or better
+is recommended.  If you have several perl versions
+installed, select the one Automake should use using
   ./configure PERL=/path/to/perl])
 }
 
diff --git a/tests/automake.test b/tests/automake.test
index 0d12892ef..4e197d34d 100755
--- a/tests/automake.test
+++ b/tests/automake.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2006  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -27,8 +27,11 @@ $AUTOMAKE --help
 $AUTOMAKE --version
 AUTOMAKE_fails --voo
 grep 'unrecognized option.*--voo' stderr
-AUTOMAKE_fails -- --voo
-grep 'input file.*--voo' stderr
+# older perl has a buggy Getopt::Long which makes this fail.
+if $PERL -e 'require 5.8.2;'; then
+  AUTOMAKE_fails -- --voo
+  grep 'input file.*--voo' stderr
+fi
 AUTOMAKE_fails ''
 grep 'empty argument' stderr
 AUTOMAKE_fails -W
-- 
2.11.4.GIT