* tests/testsuite.at (LT_AT_AUTOMAKE): New macro.

* tests/subproject.at: Use it.  Do not call `autoreconf' in
tests, since it will try to reconfigure `sub/ltdl', which
breaks `make check' during `distcheck' because of a readonly
source tree.

diff --git a/ChangeLog b/ChangeLog
index 744efa028a7bb62840848d4f78dc5a9a57f88351..8610ba4d32eef9ac473afec4435a3da824ac1a06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-10-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * tests/testsuite.at (LT_AT_AUTOMAKE): New macro.
+       * tests/subproject.at: Use it.  Do not call `autoreconf' in
+       tests, since it will try to reconfigure `sub/ltdl', which
+       breaks `make check' during `distcheck' because of a readonly
+       source tree.
+
        * libltdl/m4/ltdl.m4 (LT_WITH_LTDL): Also set INCLTDL.
 
        * libltdl/m4/ltdl.m4 (LTDL_CONVENIENCE, LTDL_INSTALLABLE)

diff --git a/tests/subproject.at b/tests/subproject.at
index 4709c7080558fa4861b2f91e50330256c29c6b21..28578abbde221de7bc3cdf49246d7fb7a9b4ac62 100644 (file)
--- a/tests/subproject.at
+++ b/tests/subproject.at
@@ -51,8 +51,11 @@ touch foo.c
 AT_SETUP([compiling softlinked libltdl])
 
 _LTDL_SETUP
+touch config.h.in
 LT_AT_LIBTOOLIZE([--ltdl])
-LT_AT_AUTORECONF([--force --verbose --install])
+LT_AT_ACLOCAL([-I sub/ltdl/m4])
+LT_AT_AUTOMAKE([--add-missing --copy])
+LT_AT_AUTOCONF
 LT_AT_CONFIGURE
 LT_AT_MAKE
 
@@ -68,8 +71,11 @@ AT_CLEANUP
 AT_SETUP([compiling copied libltdl])
 
 _LTDL_SETUP
+touch config.h.in
 LT_AT_LIBTOOLIZE([--copy --ltdl])
-LT_AT_AUTORECONF([--force --verbose --install])
+LT_AT_ACLOCAL([-I sub/ltdl/m4])
+LT_AT_AUTOMAKE([--add-missing --copy])
+LT_AT_AUTOCONF
 LT_AT_CONFIGURE
 LT_AT_MAKE
 
@@ -87,8 +93,11 @@ AT_SETUP([installable libltdl])
 prefix=`pwd`/_inst
 
 _LTDL_SETUP
+touch config.h.in
 LT_AT_LIBTOOLIZE([--copy --ltdl])
-LT_AT_AUTORECONF([--force --verbose --install])
+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])
 

diff --git a/tests/testsuite.at b/tests/testsuite.at
index cf1a9d42827401a3e0d5eba2fb14553a40bdd059..6e0f485be23a84d99c6b1269659fc71906519b93 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -69,6 +69,13 @@ m4_define([LT_AT_AUTOCONF],
 ])
 
 
+# LT_AT_AUTOMAKE([OPTIONS])
+# --------------------------
+m4_define([LT_AT_AUTOMAKE],
+[AT_CHECK([$AUTOMAKE $1], [0], [ignore], [ignore])
+])
+
+
 # LT_AT_AUTORECONF([OPTIONS])
 # --------------------------
 m4_define([LT_AT_AUTORECONF],