mirror of
git://git.sv.gnu.org/autoconf
synced 2025-01-30 11:01:45 +08:00
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>
This commit is contained in:
parent
c106e61216
commit
525a2de254
@ -1,3 +1,9 @@
|
||||
2010-06-08 Eric Blake <eblake@redhat.com>
|
||||
|
||||
Run libtool test with modern libtool.
|
||||
* tests/foreign.at (Libtool): Request that libtoolize install
|
||||
auxiliary files. Assume libtool 2.x is modern.
|
||||
|
||||
2010-06-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
Coverage and doc fixes for AC_LANG_SOURCE and AC_LANG_PROGRAM.
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user