From: Peter O'Gorman <peter@pogma.com>
Date: Wed, 24 Aug 2005 04:51:41 +0000 (+0000)
Subject: * libltdl/config/ltmain.m4sh (inherited_linker_flags): Work when
X-Git-Tag: release-2-1b~563
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9dbbe605b7dd4cc4a178016d12b3509a84bda032;p=thirdparty%2Flibtool.git

* libltdl/config/ltmain.m4sh (inherited_linker_flags): Work when
output is an application too.
Reported by Christopher Egger <Christoph_Egger@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index bf04ec7e6..2f211d600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-24  Peter O'Gorman  <peter@pogma.com>
+
+	* libltdl/config/ltmain.m4sh (inherited_linker_flags): Work when
+	output is an application too.
+	Reported by Christopher Egger <Christoph_Egger@gmx.de>
+
 2005-08-23  Stepan Kasal  <kasal@ucw.cz>,
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 59a994964..47a925f48 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -3357,19 +3357,20 @@ func_mode_link ()
 	# Read the .la file
 	func_source "$lib"
 
-	case $host in
-	*-*-darwin*)
-	  # Convert "-framework foo" to "foo.ltframework"
-	  if test -n "$inherited_linker_flags"; then
-	    tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([[^ $]]*\)/\1.ltframework/g'`
-	    new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flags"
-	  fi
-	  dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([[^ $]]*\).ltframework% -framework \1%g'`
-	  ;;
-	esac
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([[^ $]]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([[^ $]]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "prog,link"; then
-	  compile_deplibs="$inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$inherited_linker_flags $finalize_deplibs"
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
 	  compiler_flags="$compiler_flags $inherited_linker_flags"
 	fi