-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Applied to HEAD.
* looking for [EMAIL PROTECTED]/libtool--devo--1.0--patch-369 to compare with * comparing to [EMAIL PROTECTED]/libtool--devo--1.0--patch-369 M tests/old-m4-iface.at M ChangeLog M tests/nonrecursive.at M tests/am-subdir.at M tests/testsuite.at M tests/subproject.at * modified files Index: Changelog from Gary V. Vaughan <[EMAIL PROTECTED]> * tests/testsuite.at (LT_AT_BOOTSTRAP): Allow passing arguments to configure. * tests/old-m4-iface.at, tests/subproject.at: Use LT_AT_BOOTSTRAP. --- orig/tests/am-subdir.at +++ mod/tests/am-subdir.at @@ -31,6 +31,7 @@ [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[) AM_INIT_AUTOMAKE([subdir-objects foreign]) LT_INIT([win32-dll]) +AC_PROG_CC AM_PROG_CC_C_O AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -73,8 +74,8 @@ ** This is libsub ** ]]) -LT_AT_BOOTSTRAP -LT_AT_MAKE +LT_AT_BOOTSTRAP([--copy], [], [ignore], [--add-missing]) + LT_AT_EXEC_CHECK([subdir/subdemo], 0, expout) AT_CLEANUP @@ -91,6 +92,7 @@ AT_DATA([[configure.ac]], [[AC_INIT([subdir-demo], ]]AT_PACKAGE_VERSION[[, ]]AT_PACKAGE_BUGREPORT[[) AM_INIT_AUTOMAKE([subdir-objects foreign]) +AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_CXXCPP @@ -148,8 +150,8 @@ int libsub::sub (void) { return 27; } ]]) -LT_AT_BOOTSTRAP -LT_AT_MAKE +LT_AT_BOOTSTRAP([--copy], [], [ignore], [--add-missing]) + LT_AT_EXEC_CHECK([subdir/subdemo], 0) AT_CLEANUP --- orig/tests/nonrecursive.at +++ mod/tests/nonrecursive.at @@ -76,13 +76,7 @@ cp libltdl/$file $file done -LT_AT_ACLOCAL([-I libltdl/m4]) -LT_AT_AUTOHEADER -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE -LT_AT_MAKE +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy]) AT_CHECK([test -f libltdl/libltdlc.la]) @@ -105,13 +99,7 @@ cp libltdl/$file $file done -LT_AT_ACLOCAL([-I libltdl/m4]) -LT_AT_AUTOHEADER -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE -LT_AT_MAKE +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy]) AT_CHECK([test -f libltdl/libltdlc.la]) @@ -136,13 +124,8 @@ cp libltdl/$file $file done -LT_AT_ACLOCAL([-I libltdl/m4]) -LT_AT_AUTOHEADER -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix]) -LT_AT_MAKE([all install]) +LT_AT_BOOTSTRAP([ignore], [-I libltdl/m4], [ignore], [--add-missing --copy], + [], [--enable-ltdl-install --prefix=$prefix], [all install]) AT_CHECK([test -f $prefix/lib/libltdl.la]) AT_CHECK([test -f $prefix/include/ltdl.h]) --- orig/tests/old-m4-iface.at +++ mod/tests/old-m4-iface.at @@ -71,14 +71,11 @@ # This is slightly bogus, since only libtool.m4 was required in aclocal.m4 # with libtool-1.5x... -test -f aclocal.m4 \ - || cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \ - "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4 \ - || exit 1 - -LT_AT_AUTOCONF([--force]) -LT_AT_CONFIGURE -LT_AT_MAKE +AT_CHECK([test -f aclocal.m4 || + cat "$macrodir/libtool.m4" "$macrodir/ltoptions.m4" \ + "$macrodir/ltsugar.m4" "$macrodir/ltversion.m4" > aclocal.m4]) + +LT_AT_BOOTSTRAP([ignore], [ignore], [ignore], [ignore], [--force]) LT_AT_EXEC_CHECK([./old], 0, [Hello, World!]) @@ -133,11 +130,8 @@ $(LTCOMPILE) -c -o $@ $< ]]) -LT_AT_LIBTOOLIZE([--ltdl --install]) -LT_AT_ACLOCAL([-I libltdl/m4]) -LT_AT_AUTOCONF([--force]) -LT_AT_CONFIGURE -LT_AT_MAKE +LT_AT_BOOTSTRAP([--ltdl --install], [-I libltdl/m4], [ignore], [ignore], + [--force]) LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore]) --- orig/tests/subproject.at +++ mod/tests/subproject.at @@ -52,13 +52,7 @@ _LTDL_SETUP -LT_AT_LIBTOOLIZE([--ltdl]) -LT_AT_ACLOCAL([-I sub/ltdl/m4]) -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE -LT_AT_MAKE +LT_AT_BOOTSTRAP([--ltdl], [-I sub/ltdl/m4], [ignore], [--add-missing --copy]) AT_CHECK([test -f sub/ltdl/libltdlc.la]) @@ -73,13 +67,8 @@ _LTDL_SETUP -LT_AT_LIBTOOLIZE([--copy --ltdl]) -LT_AT_ACLOCAL([-I sub/ltdl/m4]) -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE -LT_AT_MAKE +LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore], + [--add-missing --copy]) AT_CHECK([test -f sub/ltdl/libltdlc.la]) @@ -96,13 +85,9 @@ _LTDL_SETUP -LT_AT_LIBTOOLIZE([--copy --ltdl]) -LT_AT_ACLOCAL([-I sub/ltdl/m4]) -LT_AT_AUTOMAKE([--add-missing --copy]) -LT_AT_AUTOCONF - -LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix]) -LT_AT_MAKE([all install]) +LT_AT_BOOTSTRAP([--copy --ltdl], [-I sub/ltdl/m4], [ignore], + [--add-missing --copy], [], [--enable-ltdl-install --prefix=$prefix], + [all install]) AT_CHECK([test -f $prefix/lib/libltdl.la]) AT_CHECK([test -f $prefix/include/ltdl.h]) --- orig/tests/testsuite.at +++ mod/tests/testsuite.at @@ -105,12 +105,17 @@ ]) -# LT_AT_BOOTSTRAP -# --------------- +# LT_AT_BOOTSTRAP([LIBTOOLIZE-ARGS], [ACLOCAL-ARGS], [AUTOHEADER-ARGS], +# [AUTOMAKE-ARGS], [AUTOCONF-ARGS], [CONFIGURE-ARGS], [MAKE-ARGS]) +# ---------------------------------------------------------------------- m4_define([LT_AT_BOOTSTRAP], -[LT_AT_LIBTOOLIZE([--copy]) -LT_AT_AUTORECONF([--force --verbose --install]) -LT_AT_CONFIGURE +[m4_if([$1], [ignore], [], [LT_AT_LIBTOOLIZE([$1])]) +m4_if([$2], [ignore], [], [LT_AT_ACLOCAL([$2])]) +m4_if([$3], [ignore], [], [LT_AT_AUTOHEADER([$3])]) +m4_if([$4], [ignore], [], [LT_AT_AUTOMAKE([$4])]) +m4_if([$5], [ignore], [], [LT_AT_AUTOCONF([$5])]) +m4_if([$6], [ignore], [], [LT_AT_CONFIGURE([$6])]) +m4_if([$7], [ignore], [], [LT_AT_MAKE([$7])]) ]) - -- Gary V. Vaughan ())_. [EMAIL PROTECTED],gnu.org} Research Scientist ( '/ http://tkd.kicks-ass.net GNU Hacker / )= http://www.gnu.org/software/libtool Technical Author `(_~)_ http://sources.redhat.com/autobook _________________________________________________________ This patch notification generated by tlaapply version 1.0 http://tkd.kicks-ass.net/arch/[EMAIL PROTECTED]/cvs-utils--tla--1.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (Darwin) iD8DBQFDc2AVFRMICSmD1gYRAkCiAKDOTphmOMwbf++GUBKuubEf1qox0gCgq8of dvvBCn9chI79R7aW0LUXVOk= =KLJ3 -----END PGP SIGNATURE-----