Fix installcheck dependencies, fix for --program-transform-name.

* Makefile.am (installcheck-local): Depend upon tests/atconfig
and $(srcdir)/$(TESTSUITE).
* tests/testsuite.at (_LIBTOOLIZE_TRANSFORM): New macro.
(LT_AT_CHECK_LIBTOOLIZE): Use it to transform expout and experr
files suitably.
* HACKING: Update.

diff --git a/ChangeLog b/ChangeLog
index 079a306df6718123d8edff4f574d4228abec6ff8..3d3555ff3e11f7ec2f0f9c7e37495a37e7f3fd5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-03-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix installcheck dependencies, fix for --program-transform-name.
+       * Makefile.am (installcheck-local): Depend upon tests/atconfig
+       and $(srcdir)/$(TESTSUITE).
+       * tests/testsuite.at (_LIBTOOLIZE_TRANSFORM): New macro.
+       (LT_AT_CHECK_LIBTOOLIZE): Use it to transform expout and experr
+       files suitably.
+       * HACKING: Update.
+
        Drop usage of obsolete macros AC_EXEEXT and AC_OBJEXT.
        * libltdl/m4/libtool.m4 (_LT_ENABLE_LOCK, _LT_COMPILER_OPTION)
        (_LT_COMPILER_C_O, LT_PATH_NM, _LT_CMD_GLOBAL_SYMBOLS, _LT_SETUP):

diff --git a/HACKING b/HACKING
index 6968cb6181547b369cee0dda40187b0c1605b842..da95e7e0a0d77180aea8f869a5b1080e2565db29 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -675,8 +675,9 @@ or obtained by writing to the Free Software Foundation, Inc.,
   libtool.
 
 * Run `make distcheck' and `make distcheck
-  DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'.  If there are any
-  problems, fix them and start again.
+  DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'.  Try a distcheck
+  with --program-prefix=g.  If there are any problems, fix them and
+  start again.
 
 * Run ./commit from the source tree.
 

diff --git a/Makefile.am b/Makefile.am
index 771c8efe3550411f466556280eee743f054537d9..6e7c802c29a1f5f8c2df12eaa1911c4f8c1c8a0d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -523,7 +523,7 @@ check-local: tests/atconfig $(srcdir)/$(TESTSUITE) libltdl/libltdlc.la $(bin_SCR
          $(TESTS_ENVIRONMENT) $(BUILDCHECK_ENVIRONMENT) $(TESTSUITEFLAGS)
 
 # Run the test suite on the *installed* tree.
-installcheck-local:
+installcheck-local: tests/atconfig $(srcdir)/$(TESTSUITE)
        $(CD_TESTDIR); \
        CONFIG_SHELL="$(SHELL)" $(SHELL) $$abs_srcdir/$(TESTSUITE) \
          $(TESTS_ENVIRONMENT) $(INSTALLCHECK_ENVIRONMENT) $(TESTSUITEFLAGS) \

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 52ef6dd530ae004c88680c60b0fb32566637e6a6..d2f89dd523d978b0904611b7adfc536185fe83a2 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -57,10 +57,22 @@ AT_KEYWORDS([libtoolize])
 ])
 
 
+# _LIBTOOLIZE_TRANSFORM(FILE)
+# ---------------------------
+# Fix the expected output of installed libtoolize in presence of --program-*.
+m4_define([_LIBTOOLIZE_TRANSFORM],
+[lt_name=`$ECHO "$LIBTOOLIZE" | sed 's,^.*/,,'` # restore font-lock: ''
+sed "s/^libtoolize/$lt_name/" < $1 > $1.t
+mv -f $1.t $1
+])dnl
+
+
 # LT_AT_CHECK_LIBTOOLIZE(ARGS, [EXIT-STATUS = 0], [STDOUT = `'], [STDERR = `'])
 # -----------------------------------------------------------------------------
 m4_define([LT_AT_CHECK_LIBTOOLIZE],
-[AT_CHECK([LT_AT_LIBTOOLIZE([$1])],
+[m4_if([$3], [expout], [_LIBTOOLIZE_TRANSFORM([$3])])dnl
+m4_if([$4], [experr], [_LIBTOOLIZE_TRANSFORM([$4])])dnl
+AT_CHECK([LT_AT_LIBTOOLIZE([$1])],
   [$2], [$3], [$4])
 ])