[vlc-commits] commit: quartztext: Allow to bypass quartztext build on Darwin. (Pierre d' Herbemont )

[git at videolan.org]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Sun Oct 31 10:27:36 2010 +0100| [dc3c197863e46e0f2acc85c8c2724f1453a697e8] | committer: Pierre d'Herbemont 

quartztext: Allow to bypass quartztext build on Darwin.

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

 configure.ac            |   12 ++++++++++++
 modules/misc/Modules.am |    3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e962740..0cc9ac7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3372,6 +3372,18 @@ then
 fi
 
 dnl
+dnl  QuartzText vout module (iOS/Mac OS)
+dnl
+AC_ARG_ENABLE(macosx-quartztext,
+  [  --enable-macosx-quartztext   Mac OS X quartz text module (default enabled on Mac OS X)])
+if test "x${enable_macosx_quartztext}" != "xno" &&
+  (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes")
+then
+  VLC_ADD_PLUGIN([quartztext])
+  VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices])
+fi
+
+dnl
 dnl  Windows DirectX module
 dnl
 
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 98be89e..f1bb659 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -30,9 +30,6 @@ libvlc_LTLIBRARIES += \
 if HAVE_WINCE
 libvlc_LTLIBRARIES += libwin32text_plugin.la
 endif
-if HAVE_DARWIN
-libvlc_LTLIBRARIES += libquartztext_plugin.la
-endif
 if ENABLE_SOUT
 libvlc_LTLIBRARIES += \
 	libvod_rtsp_plugin.la \