OK to apply? This fixes ./configure --program-prefix=g make all install installcheck
and also causes the testsuite to be correctly rebuilt upon installcheck. Thanks, Ralf 2008-03-08 Ralf Wildenhues <[EMAIL PROTECTED]> 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. Index: Makefile.am =================================================================== RCS file: /cvsroot/libtool/libtool/Makefile.am,v retrieving revision 1.230 diff -u -r1.230 Makefile.am --- Makefile.am 4 Mar 2008 21:25:48 -0000 1.230 +++ Makefile.am 8 Mar 2008 13:20:52 -0000 @@ -523,7 +523,7 @@ $(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) \ Index: tests/testsuite.at =================================================================== RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v retrieving revision 1.51 diff -u -r1.51 testsuite.at --- tests/testsuite.at 1 Feb 2008 19:06:42 -0000 1.51 +++ tests/testsuite.at 8 Mar 2008 13:20:53 -0000 @@ -57,10 +57,22 @@ ]) +# _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]) ])