Fix getopt tests to skip with Autoconf < 2.61.

* tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Skip the test
if 'autom4te --language=m4sh' exits 63 because version 2.61 is
required.  Allows the testsuite to complete successfully with
Autoconf 2.59 and Automake 1.9.6.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 6b8767f6a75d32ed8f669b034e59e604e6e9060e..843f9426e07f00994bbabd63381ffaa4c6e0c022 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix getopt tests to skip with Autoconf < 2.61.
+       * tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Skip the test
+       if 'autom4te --language=m4sh' exits 63 because version 2.61 is
+       required.  Allows the testsuite to complete successfully with
+       Autoconf 2.59 and Automake 1.9.6.
+
        Tidy and fix clean and distclean rules for old testsuite.
        * Makefile.am (clean-local-legacy): Use $(CONF_SUBDIRS) instead
        of hard-coding the list of test directories.  Use

diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index 3e58db1acb6bc3e4844ad5d72c54a2e95adbe364..d2df82755d3298e67e9e185e8fa27f751b663e4f 100644 (file)
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -48,12 +48,9 @@ M4SH_GETOPTS(
 ]])
 m4_pattern_forbid([m4_include])
 m4_pattern_forbid([AS_INIT])
-
-$M4SH -B $abs_top_srcdir/libltdl/config options.m4sh \
-    | $SED \
-       -e "s,@LN_S\@,$LN_S,g" \
-       -e "s,@SED\@,$SED,g" \
-    > options
+AT_CHECK([$M4SH -B $abs_top_srcdir/libltdl/config options.m4sh > t-options],
+        [], [], [], [AT_CHECK([test $at_status -eq 63 && exit 77])])
+$SED "s,@LN_S\@,$LN_S,g;s,@SED\@,$SED,g" t-options > options
 ])# _LT_AT_GETOPT_M4SH_SETUP