From 3160ead1712bbe567d30defd2a65cfe03f34406d Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 21 Aug 2010 06:56:37 +0200 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ tests/getopt-m4sh.at | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b8767f6a..843f9426e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-08-22 Ralf Wildenhues + 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 3e58db1ac..d2df82755 100644 --- 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 -- 2.47.3