Fix 'DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g' bug.

* tests/testsuite.at (_LIBTOOLIZE_TRANSFORM): Fix test failures
with --program-prefix, where the test case output contains the
transformed name somewhere other than the beginning of a line.
* libtoolize.m4sh (func_check_macros): Be sure to always use
the transformed name in output messages.

diff --git a/ChangeLog b/ChangeLog
index b5b3347e088a2e78ed5c029660e855d8ac7e4984..41922834285b3408860202a9aa25de9c85fc8857 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-06  Gary V. Vaughan  <gary@gnu.org>
+
+       Fix 'DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g' bug.
+       * tests/testsuite.at (_LIBTOOLIZE_TRANSFORM): Fix test failures
+       with --program-prefix, where the test case output contains the
+       transformed name somewhere other than the beginning of a line.
+       * libtoolize.m4sh (func_check_macros): Be sure to always use
+       the transformed name in output messages.
+
 2008-09-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Do not remove .gcno files when linking.
@@ -11,12 +20,12 @@
        Revert 75142db4f8afc65ba7aae0ed80ea0b35bd9cc382 (AIX libltdl
        dlopen(NULL)
 
-       libltdl/m4/ltdl.m4: Remove LTDL_DLOPEN_SELF_WORKS define.
-       libltdl/loaders/dlopen.c: Remove LTDL_DLOPEN_SELF_WORKS check.
-       libltdl/m4/libtool.m4 [aix]: Set export_dynamic_flag_spec to
+       * libltdl/m4/ltdl.m4: Remove LTDL_DLOPEN_SELF_WORKS define.
+       * libltdl/loaders/dlopen.c: Remove LTDL_DLOPEN_SELF_WORKS check.
+       * libltdl/m4/libtool.m4 [aix]: Set export_dynamic_flag_spec to
        -Wl,-bexpall. This is a temporary workaround until a real fix
        is implemented.
-       NEWS: document it.
+       * NEWS: document it.
 
 2008-08-26  Peter O'Gorman  <peter@pogma.com>
 

diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 092cd25b73b28f9da4714280eaf122d8121326aa..42e07df74d622dbe6608d425dde3b0c9a9ffdcaf 100644 (file)
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1476,12 +1476,12 @@ func_check_macros ()
     # Suggest modern idioms for storing autoconf macros:
     $ac_config_macro_dir_advised || if test -z "$ac_macrodir" || test x"$macrodir" = x.; then
       func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to $configure_ac and"
-      func_echo "rerunning libtoolize, to keep the correct libtool macros in-tree."
+      func_echo "rerunning $progname, to keep the correct libtool macros in-tree."
       ac_config_macro_dir_advised=:
 
     elif test -z "$ac_macrodir$ltdldir"; then
       func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([$macrodir])' to $configure_ac,"
-      func_echo "and rerunning libtoolize and aclocal."
+      func_echo "and rerunning $progname and aclocal."
       ac_config_macro_dir_advised=:
     fi
 

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7a3b01d48cc22dcd1073452b8df14a85875c98cb..5037d1429dd685e5a433c87cb02161ce6e9692c1 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -74,7 +74,7 @@ AT_KEYWORDS([libtoolize])
 # Fix the expected output of installed libtoolize in presence of --program-*.
 m4_define([_LIBTOOLIZE_TRANSFORM],
 [lt_name=`$ECHO "$LIBTOOLIZE" | sed "s,^.*/,,"`
-sed "s/^libtoolize/$lt_name/
+sed "s/libtoolize/$lt_name/g
 s|/usr/local/share/aclocal/|${tst_aclocaldir-$abs_top_srcdir/libltdl/m4}/|" < $1 > $1.t
 mv -f $1.t $1
 ])dnl