From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 9 Aug 2010 21:16:12 +0000 (+0200)
Subject: Fix more problematic code from "Add func_append_quoted and do..."
X-Git-Tag: v2.4~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c1027fe214c4b0c72f905defcda38faf9e94bf3;p=thirdparty%2Flibtool.git

Fix more problematic code from "Add func_append_quoted and do..."

* libltdl/config/ltmain.m4sh (func_mode_link): Revert back
func_append instances that as assignments relied on the shell
not performing word splitting on the right hand side of the
assignment.

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

diff --git a/ChangeLog b/ChangeLog
index 869897b95..b71c668b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix more problematic code from "Add func_append_quoted and do..."
+	* libltdl/config/ltmain.m4sh (func_mode_link): Revert back
+	func_append instances that as assignments relied on the shell
+	not performing word splitting on the right hand side of the
+	assignment.
+
 	Fix another typo on "Add func_append_quoted and do..."
 	* libltdl/config/ltmain.m4sh (func_mode_link): Fix regression in
 	computation of finalize_rpath introduced in v2.2.10-40-g0da7d80,
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index e5065fbca..d67752956 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -2464,7 +2464,7 @@ func_extract_archives ()
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      func_append my_oldobjs " "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
@@ -5854,7 +5854,7 @@ func_mode_link ()
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  func_append compiler_flags " "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"