From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 23 Nov 2008 14:36:14 +0000 (+0100)
Subject: Fix $ECHO test to not influence other _AS_DETECT_SUGGESTED code.
X-Git-Tag: v2.2.7b~160
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=447a83159b6702d3644370774d334f3ba17c1bf4;p=thirdparty%2Flibtool.git

Fix $ECHO test to not influence other _AS_DETECT_SUGGESTED code.

* libltdl/m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH): Fix test to
not influence further tests registered with _AS_DETECT_SUGGESTED
and do not use a PATH below /tmp, to avoid influence by a third
party.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index af83a7281..d7ae7cd65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-11-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+	    Eric Blake  <ebb9@byu.net>
+
+	Fix $ECHO test to not influence other _AS_DETECT_SUGGESTED code.
+	* libltdl/m4/libtool.m4 (_LT_PROG_ECHO_BACKSLASH): Fix test to
+	not influence further tests registered with _AS_DETECT_SUGGESTED
+	and do not use a PATH below /tmp, to avoid influence by a third
+	party.
+
 2008-11-23  Alon Bar-Lev  <alon.barlev@gmail.com>  (tiny change)
 
 	Fix func_win32_libid for 64-bit Windows.
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 633d8f8e4..5d1a131c3 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1114,12 +1114,13 @@ esac
 
 m4_ifdef([_AS_DETECT_SUGGESTED],
 [_AS_DETECT_SUGGESTED([
-  ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-  ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-  ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-  PATH=/tmp/nonexistent; export PATH;
-  FPATH=$PATH; export FPATH;
-  test "X`printf %s $ECHO`" = "X$ECHO"])])
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
 _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])