From: Ralf Wildenhues Date: Mon, 3 Jan 2005 14:06:12 +0000 (+0000) Subject: * tests/am-subdir.at tests/testsuite.at (AT_BOOTSTRAP, X-Git-Tag: release-2-1b~795 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d51635bd8a86b2063bc1d83a72fa1c5ccb23667;p=thirdparty%2Flibtool.git * tests/am-subdir.at tests/testsuite.at (AT_BOOTSTRAP, AT_LIBTOOLIZE, AT_CHECK_LIBTOOLIZE) Rename to .. (LT_AT_BOOTSTRAP, LT_AT_LIBTOOLIZE, LT_AT_CHECK_LIBTOOLIZE) and make use of new names. --- diff --git a/ChangeLog b/ChangeLog index 385d380ec..ac3147232 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-01-03 Ralf Wildenhues + + * tests/am-subdir.at tests/testsuite.at (AT_BOOTSTRAP, + AT_LIBTOOLIZE, AT_CHECK_LIBTOOLIZE) Rename to .. + (LT_AT_BOOTSTRAP, LT_AT_LIBTOOLIZE, LT_AT_CHECK_LIBTOOLIZE) + and make use of new names. + 2004-12-30 Ralf Wildenhues * config/getopt.m4sh (func_version, func_usage, func_help): diff --git a/tests/am-subdir.at b/tests/am-subdir.at index 162175ddb..740e0944b 100644 --- a/tests/am-subdir.at +++ b/tests/am-subdir.at @@ -72,7 +72,7 @@ AT_DATA(expout, ** This is libsub ** ]]) -AT_BOOTSTRAP +LT_AT_BOOTSTRAP "${MAKE-make}" AT_CHECK([subdir/subdemo], 0, expout) @@ -155,7 +155,7 @@ AT_DATA(expout, ** This is libsub::sub ** ]]) -AT_BOOTSTRAP +LT_AT_BOOTSTRAP "${MAKE-make}" AT_CHECK([subdir/subdemo], 0, expout) diff --git a/tests/testsuite.at b/tests/testsuite.at index 76ff23b67..e6999a8da 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -23,26 +23,26 @@ m4_divert_push([PREPARE_TESTS])dnl export LIBTOOLIZE m4_divert_pop([PREPARE_TESTS])dnl -# AT_LIBTOOLIZE([ARGS]) -# --------------------- -m4_define([AT_LIBTOOLIZE], +# LT_AT_LIBTOOLIZE([ARGS]) +# ------------------------ +m4_define([LT_AT_LIBTOOLIZE], ["$LIBTOOLIZE" -I "$abs_top_srcdir" -I "$abs_top_srcdir/config" $1 ]) -# AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = `'], [STDERR = `']) -# -------------------------------------------------------------------------- -m4_define([AT_CHECK_LIBTOOLIZE], -[AT_CHECK([AT_LIBTOOLIZE([$1])], +# LT_AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = `'], [STDERR = `']) +# ----------------------------------------------------------------------------- +m4_define([LT_AT_CHECK_LIBTOOLIZE], +[AT_CHECK([LT_AT_LIBTOOLIZE([$1])], [$2], [$3], [$4]) ]) -# AT_BOOTSTRAP -# ------------ -m4_define([AT_BOOTSTRAP], +# LT_AT_BOOTSTRAP +# --------------- +m4_define([LT_AT_BOOTSTRAP], [ -test -f ./ltmain.sh || AT_LIBTOOLIZE([--copy]) +test -f ./ltmain.sh || LT_AT_LIBTOOLIZE([--copy]) test -f ./configure || autoreconf --force --verbose --install test -f ./configure || exit 1 ./configure