diff options
| author | Eric Blake <eblake@redhat.com> | 2010-06-07 10:11:07 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-06-08 04:15:20 -0600 |
| commit | 525a2de254e4bc230b3ffe1215cd77d4949737cf (patch) | |
| tree | 96ed278ba821d8cb420d32f0ba23a0b945b8317a /tests/foreign.at | |
| parent | c106e61216c5b339c093dcf01ae42635759166db (diff) | |
| download | autoconf-525a2de254e4bc230b3ffe1215cd77d4949737cf.tar.gz | |
Run libtool test with modern libtool.
* tests/foreign.at (Libtool): Request that libtoolize install
auxiliary files. Assume libtool 2.x is modern.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/foreign.at')
| -rw-r--r-- | tests/foreign.at | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/tests/foreign.at b/tests/foreign.at index 18aef31a..b223d206 100644 --- a/tests/foreign.at +++ b/tests/foreign.at @@ -27,8 +27,9 @@ AT_SETUP([Libtool]) # Skip this test if there is no libtoolize. AT_CHECK([libtoolize --version || exit 77], - ignore, ignore, ignore) -# CVS Autoconf probably does not work with too old Libtools. + [ignore], [ignore], [ignore]) +# Modern Libtool has further tests for compatibility with older autoconf; +# from the Autoconf side, we will merely assume newer libtool. AT_CHECK([[ case `libtoolize --version | sed -n '/^.* \([0-9][0-9.a-z]*\)$/{ @@ -36,23 +37,20 @@ case `libtoolize --version | p q }'` in - 0.* ) exit 77;; - 1.[0123]* ) exit 77;; + 0.* ) exit 77;; + 1.* ) exit 77;; esac]], - ignore, ignore, ignore) + [ignore], [ignore], [ignore]) -# FIXME: Once Libtool `configure.ac' aware, change this. -# Using a configure.in, have libtoolize confess where libtool.m4 is. -AT_DATA([configure.in], +# Using a configure.ac, have libtoolize confess where libtool.m4 is. +AT_DATA([configure.ac], [[AC_INIT # State that we explicitly want auxiliary files here, so libtoolize # won't pollute files outside the test directory. -AC_CONFIG_AUX_DIR(.) +AC_CONFIG_AUX_DIR([.]) 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 -i], [0], [stdout], [ignore]) # Some broken libtoolize fail to install a functional config.guess. AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) @@ -60,17 +58,18 @@ AT_CHECK([./config.guess || exit 77], [], [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([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) +AT_CHECK([test -f "`sed -n 1p stdout`"]) -# libtoolize installed everything but install-sh... -touch install-sh +# Older libtoolize installed everything but install-sh... +AT_CHECK([test -f install-sh || touch install-sh]) # Build the concatenation of libtool.m4 and configure.ac. -cp "`cat stdout`" configure.in -cat >>configure.in <<_EOF +AT_CHECK([[sed 's/.*/m4''_include([&])/' stdout]], [0], [stdout]) +AT_CHECK([mv stdout aclocal.m4]) +cat >configure.ac <<_EOF AC_INIT -AC_CONFIG_AUX_DIR(.) +AC_CONFIG_AUX_DIR([.]) AC_CANONICAL_SYSTEM AC_PROG_LIBTOOL _EOF |