* 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.
This commit is contained in:
Ralf Wildenhues 2007-05-03 18:07:28 +00:00
parent 3399dea117
commit 3175b66b64
4 changed files with 20 additions and 1 deletions

View File

@ -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) 2007-05-03 Reuben Thomas <rrt@sc3d.org> (tiny change)
* doc/libtool.texi (Libltdl interface): Fix typo. * doc/libtool.texi (Libltdl interface): Fix typo.

1
THANKS
View File

@ -75,6 +75,7 @@
Carl D. Roth roth@cse.ucsc.edu Carl D. Roth roth@cse.ucsc.edu
Chris P. Ross cross@eng.us.uu.net Chris P. Ross cross@eng.us.uu.net
Christian Biesinger cbiesinger@web.de Christian Biesinger cbiesinger@web.de
Christoph Egger Christoph_Egger@gmx.de
Christopher Hulbert cchgroupmail@gmail.com Christopher Hulbert cchgroupmail@gmail.com
Dalibor Topic robilad@kaffe.org Dalibor Topic robilad@kaffe.org
Daniel Reed n@ml.org Daniel Reed n@ml.org

View File

@ -4668,7 +4668,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs" compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else 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
fi fi
dependency_libs="$newdependency_libs" dependency_libs="$newdependency_libs"

View File

@ -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], AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
[1],[ignore],[ignore]) [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 AT_CLEANUP