From: Charles Wilson <libtool@cwilson.fastmail.fm>
Date: Sun, 17 Jun 2007 20:16:03 +0000 (+0000)
Subject: 	* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): ensure stderr
X-Git-Tag: release-2-1b~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcac48806b4fe71a292348f0f4d42706e9228fce;p=thirdparty%2Flibtool.git

	* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): ensure stderr
	is redirected even when getconf does not exist.
---

diff --git a/ChangeLog b/ChangeLog
index a6fe39b0f..cddfae984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2007-06-17  Charles Wilson  <libtool@cwilson.fastmail.fm>
+
+	* libltdl/m4/libtool.m4 (LT_CMD_MAX_LEN): ensure stderr
+	is redirected even when getconf does not exist.
+
 2007-06-09  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
-	* ltmain.m4sh (func_emit_libtool_wrapper_script):
+	* libltdl/config/ltmain.m4sh (func_emit_libtool_wrapper_script):
 	Take an argument to specify value assigned to
 	WRAPPER_SCRIPT_BELONGS_IN_OBJDIR in the emitted
 	script.
@@ -23,14 +28,14 @@
 
 2007-06-07  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
-	* ltmain.m4sh (func_emit_libtool_cwrapperexe_source):
+	* libltdl/config/ltmain.m4sh (func_emit_libtool_cwrapperexe_source):
 	ensure that generated source follows GCS as nearly as
 	possible.
 
 2007-06-07  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
-	* ltmain.m4sh (func_emit_libtool_wrapper_script): add
-	code block to handle cases when wrapper script is in $objdir.
+	* libltdl/config/ltmain.m4sh (func_emit_libtool_wrapper_script):
+	add code block to handle cases when wrapper script is in $objdir.
 	(func_emit_libtool_cwrapperexe_source): replace DEBUG() macro
 	with namespace-safe LTWRAPPER_DEBUGPRINTF(). Call
 	func_emit_libtool_wrapper_script() with appropriate filters to
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index c4ca757d6..9845585a9 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -1437,7 +1437,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     fi
     ;;
   *)
-    lt_cv_sys_max_cmd_len=`getconf ARG_MAX 2> /dev/null`
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
     if test -n $lt_cv_sys_max_cmd_len; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`