From: Gary V. Vaughan <gary@gnu.org>
Date: Mon, 4 Oct 2004 17:06:35 +0000 (+0000)
Subject: * m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH): Don't confuse $ECHO
X-Git-Tag: release-1-9f~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a245ad8b0e71c830e8937a48ecf79af8c62c1dc;p=thirdparty%2Flibtool.git

* 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 550ee41d6..c42f3a433 100644
--- 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 ffe0ae69c..d8c80e882 100644
--- 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 b1f3eb5bb..42bb682e5 100644
--- 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