]> git.ipfire.org Git - thirdparty/libtool.git/commitdiff
* libltdl/config/ltmain.m4sh (inherited_linker_flags): Work when
authorPeter O'Gorman <peter@pogma.com>
Wed, 24 Aug 2005 04:51:41 +0000 (04:51 +0000)
committerPeter O'Gorman <peter@pogma.com>
Wed, 24 Aug 2005 04:51:41 +0000 (04:51 +0000)
output is an application too.
Reported by Christopher Egger <Christoph_Egger@gmx.de>

ChangeLog
libltdl/config/ltmain.m4sh

index bf04ec7e66840cbea2f13bc6d175753e84867767..2f211d6007812d1160b9f7c741b971955f5043b5 100644 (file)
--- 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>
 
index 59a994964159733440c2cd7bac1f6aee188f15bb..47a925f487eab73beb72235fd241ef17a5960069 100644 (file)
@@ -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