[vlc-commits] freetype: fix linking on Darwin

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Feb 12 16:04:47 2015 +0100| [22316cd55a3c559d0d2543283885b1d23d15f8c1] | committer: Felix Paul Kühne

freetype: fix linking on Darwin

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=22316cd55a3c559d0d2543283885b1d23d15f8c1
---

 configure.ac                      |    3 ---
 modules/text_renderer/Makefile.am |    4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 72c5341..b5fcdbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3155,9 +3155,6 @@ if test "${enable_freetype}" != "no"; then
       VLC_ADD_CPPFLAGS([skins2],[${FREETYPE_CFLAGS}])
       VLC_ADD_LIBS([skins2],[${FREETYPE_LIBS}])
 
-      AC_CHECK_HEADERS(Carbon/Carbon.h,
-                       [VLC_ADD_LIBS([freetype],[-Wl,-framework,Carbon])])
-
       dnl fontconfig support
       if test "${SYS}" != "mingw32"; then
           if test "${enable_fontconfig}" != "no"; then
diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index 979359a..f75be77 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -20,6 +20,10 @@ if HAVE_FRIBIDI
 libfreetype_plugin_la_CPPFLAGS += $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI
 libfreetype_plugin_la_LIBADD += $(FRIBIDI_LIBS)
 endif
+libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
+if HAVE_DARWIN
+libfreetype_plugin_la_LDFLAGS += -Wl,-framework,Carbon
+endif
 
 libquartztext_plugin_la_SOURCES = text_renderer/quartztext.c
 libquartztext_plugin_la_LDFLAGS = $(AM_LDLFAGS) -rpath '$(textdir)' \