From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 22 Sep 2010 18:18:54 +0000 (+0200)
Subject: Fix regression in command-line length computation.
X-Git-Tag: v2.4.2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67bbe0490f03150ebce81a5be00bdefe7c0a25c1;p=thirdparty%2Flibtool.git

Fix regression in command-line length computation.

* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): Use `env echo' rather
than possibly-undefined func_fallback_echo, to ensure we fork
and exec for this test.
* NEWS: Update.
Regression introduced in v2.2.6-39-g9c3d4d8.

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

diff --git a/ChangeLog b/ChangeLog
index 566b74efa..647c15197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix regression in command-line length computation.
+	* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): Use `env echo' rather
+	than possibly-undefined func_fallback_echo, to ensure we fork
+	and exec for this test.
+	* NEWS: Update.
+	Regression introduced in v2.2.6-39-g9c3d4d8.
+
 2010-09-22  Gary V. Vaughan  <gary@gnu.org>
 
 	Post-release administrivia.
diff --git a/NEWS b/NEWS
index 6e8e0fe4d..90e33f7dc 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,8 @@ New in 2.4.2 2010-12-??: git version 2.4.1a, Libtool team:
 
 * Bug fixes:
 
-  - None yet!
+  - The generic approximation of the command line length limit (when getconf is
+    not available) works again.  Regression introduced in v2.2.6-39-g9c3d4d8.
 
 New in 2.4 2010-09-22: git version 2.2.11a, Libtool team:
 
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index d8125842f..6aebb63b5 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1639,7 +1639,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do