* libltdl/config/ltmain.m4sh (func_mode_link): When adding

new_inherited_linker_flags to compiler_flags, remember to
translate .ltframework back.  Fixes bug introduced 2007-04-23.
* THANKS: Update.
* tests/inherited_flags.at: Amend test.
Report by Christoph Egger.

diff --git a/ChangeLog b/ChangeLog
index 1d00a2abd7528c477994240ed5e11ea34861e74e..ab7cac970f0d468401b3e3b464baa428077eb41a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * libltdl/config/ltmain.m4sh (func_mode_link): When adding
+       new_inherited_linker_flags to compiler_flags, remember to
+       translate .ltframework back.  Fixes bug introduced 2007-04-23.
+       * THANKS: Update.
+       * tests/inherited_flags.at: Amend test.
+       Report by Christoph Egger.
+
 2007-05-03  Reuben Thomas  <rrt@sc3d.org>  (tiny change)
 
        * doc/libtool.texi (Libltdl interface): Fix typo.

diff --git a/THANKS b/THANKS
index 531f2e276a9d40aa152476dd63e0c5018710ea6e..75d46836d2042a56b0617683a95ce696a3d30983 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -75,6 +75,7 @@
   Carl D. Roth                 roth@cse.ucsc.edu
   Chris P. Ross                        cross@eng.us.uu.net
   Christian Biesinger          cbiesinger@web.de
+  Christoph Egger              Christoph_Egger@gmx.de
   Christopher Hulbert          cchgroupmail@gmail.com
   Dalibor Topic                        robilad@kaffe.org
   Daniel Reed                  n@ml.org

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index df4d5c437eaf189e688aceb51965da22be34695d..ec5bd4105145c98b67775f99a2c1bfae7d1d4001 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4668,7 +4668,7 @@ func_mode_link ()
          compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
          finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
        else
-         compiler_flags="$compiler_flags $new_inherited_linker_flags"
+         compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
        fi
       fi
       dependency_libs="$newdependency_libs"

diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index cd693fa6d9240637d8440a9853b6c21afa320253..7a2fc4ec9d72b0acec817a3d5c571900b56129a3 100644 (file)
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -101,4 +101,13 @@ AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
 AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
         [1],[ignore],[ignore])
 
+mv libboth.la libboth.la.bak
+sed "s/^inherited_linker_flags.*/inherited_linker_flags='-framework Cocoa -framework ApplicationServices'/" < libboth.la.bak > libboth.la
+rm libboth.la.bak
+
+AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la -no-undefined -rpath /usr/local/lib],
+        [], [stdout], [ignore])
+AT_CHECK([grep Cocoa.ltframework stdout], [1], [], [])
+AT_CHECK([grep ' -framework Cocoa' stdout], [0], [ignore], [])
+
 AT_CLEANUP