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.
This commit is contained in:
Ralf Wildenhues 2008-03-08 17:41:44 +00:00
parent 197c2c14a1
commit d84baeaee5
4 changed files with 25 additions and 4 deletions

View File

@ -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):

View File

@ -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.

View File

@ -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) \

View File

@ -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])
])