>From f6ab5640f8369dc3e878c73a0d6e099699adb991 Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Thu, 26 Nov 2009 01:38:22 +0100 Subject: [PATCH] Fix the libtool test. * tests/foreign.at (Libtool): libtoolize --install, so that config.guessis installed. If config.guess does not work (or is not installed), do fail instead of skipping. Expect that libtoolize might mention more *.m4 files. Do not expect error output of AT_CHECK_AUTOCONF. --- ChangeLog | 9 +++++++++ tests/foreign.at | 16 ++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e90833..88fd899 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-11-26 Stepan Kasal + + Fix the libtool test. + * tests/foreign.at (Libtool): libtoolize --install, so that + config.guessis installed. If config.guess does not work (or + is not installed), do fail instead of skipping. Expect that + libtoolize might mention more *.m4 files. Do not expect error + output of AT_CHECK_AUTOCONF. + 2009-11-24 Ralf Wildenhues Fix AC_FUNC_MMAP regression with C++ compiler in 2.65. diff --git a/tests/foreign.at b/tests/foreign.at index 099a84f..a6ff399 100644 --- a/tests/foreign.at +++ b/tests/foreign.at @@ -52,22 +52,19 @@ AC_PROG_LIBTOOL ]]) # Some libtoolize complain if you don't have an aclocal.m4. AT_CHECK([touch aclocal.m4]) -AT_CHECK([libtoolize], 0, [stdout], ignore) +AT_CHECK([libtoolize --install], 0, [stdout], ignore) # Some broken libtoolize fail to install a functional config.guess. -AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) +AT_CHECK([./config.guess], [], [ignore], [ignore]) # Make sure at-path contains something valid, and let the test suite # display it when verbose. And fail, skipping would too easily hide # problems. AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], 0, [stdout]) -AT_CHECK([test -f "`cat stdout`"]) +AT_CHECK([test -f "`sed 1q stdout`"]) -# libtoolize installed everything but install-sh... -touch install-sh - -# Build the concatenation of libtool.m4 and configure.ac. -cp "`cat stdout`" configure.in +# Build the concatenation of libtool m4 files and configure.ac. +AT_CHECK([cat `cat stdout` >configure.in]) cat >>configure.in <<_EOF AC_INIT AC_CONFIG_AUX_DIR(.) @@ -75,8 +72,7 @@ AC_CANONICAL_SYSTEM AC_PROG_LIBTOOL _EOF -# FIXME: Once Libtool really fixed, stop ignoring stderr. -AT_CHECK_AUTOCONF([], [], [], [ignore]) +AT_CHECK_AUTOCONF # Ignore stderr, because ltconfig always loads the cache, which is # /dev/null, and some shells choke on this. For instance with Bash -- 1.6.4.1