* m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH): Don't confuse $ECHO

with $lt_ECHO, or we always get a libtool with ECHO=echo, rather
than testing for a mechanism that quotes  properly.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index 550ee41d65e66b688d6d070ec0fa36256e64743d..c42f3a43326d21c673df3e17d8425616c5496880 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-04  Gary V. Vaughan  <gary@gnu.org>
 
+       * m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH): Don't confuse $ECHO
+       with $lt_ECHO, or we always get a libtool with ECHO=echo, rather
+       than testing for a mechanism that quotes \ properly.
+       * NEWS: Updated.
+
        * config/ltmain.m4sh: Need to include getopt.m4sh earlier so that
        progpath is set before it is called to --no-reexec.
        * NEWS: Updated.
@@ -10,7 +15,7 @@
        dependency on autom4te.  There was some inconsistency in the
        filenames: now we have foo.m4sh -> m4sh -> foo.in -> configure
        -> foo[.sh].  Bootstrap runs the m4sh steps and the resulting .in
-       files are distributed.
+       files are distributed:
 
        * tests/Makefile.am (EXTRA_DIST): Distribute defs.m4sh.
        * Makefile.am (EXTRA_DIST): Distribute libtoolize.m4sh.

diff --git a/NEWS b/NEWS
index ffe0ae69c96371b41c1299b8dca9e136aa33bb11..d8c80e882c073a4500269996e26d422053c9cc0e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.9f: 2004-??-??; CVS version 1.9e, Libtool team:
+* Fix a regression in 1.9d, where ECHO was always set to 'echo' and the
+  backslash quoting tests were never run.
 * Fix a regression in 1.9d, where progpath was used for --no-reexec before it
   was set.
 * Fix a regression in 1.9d, which required an installed automake to build the

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b1f3eb5bb515af1c4c57efe3ac5ea0894e609c6a..42bb682e5ce1208a944d51aceb8eafb984f8bbb4 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -691,7 +691,7 @@ X*--fallback-echo)
   ;;
 esac
 
-ECHO=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
 if test "X[$]1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
   shift
@@ -719,7 +719,7 @@ fi
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-if test -z "$ECHO"; then
+if test -z "$lt_ECHO"; then
   if test "X${echo_test_string+set}" != Xset; then
     # find a string as large as possible, as long as the shell can cope with it
     for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do