* config/ltmain.m4sh (inherited_linker_flags): Backed out broken

patch.

diff --git a/ChangeLog b/ChangeLog
index 5833050a9722048bf2148526840cf883c2b8d327..7c5b7d477994afa04ab2b6d6ead9cc4a118bd012 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * config/ltmain.m4sh (inherited_linker_flags): Backed out broken
+       patch.
+
 2005-08-08  Peter O'Gorman  <peter@pogma.com>
 
        * config/ltmain.m4sh (inherited_linker_flags): Work when output

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index a928f7b2033373b6341435beba3e4a07fa5c6f5e..6f3c610f9cb5e6de46ebebc815513c5f520238c5 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -3376,19 +3376,14 @@ func_mode_link ()
          # 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_flags";;
-                 esac
-               done
+           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
        if test "$linkmode,$pass" = "prog,link"; then
-         compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-         finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+         compile_deplibs="$inherited_linker_flags $compile_deplibs"
+         finalize_deplibs="$inherited_linker_flags $finalize_deplibs"
        else
          compiler_flags="$compiler_flags $inherited_linker_flags"
        fi