[vlc-commits] qtsound: compile only if QTKit is present

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun 14 01:12:05 2016 +0200| [3de317bea3e354ba6fd8a0e44c17394a6675a7e1] | committer: Felix Paul Kühne

qtsound: compile only if QTKit is present

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

 configure.ac               |    7 ++++---
 modules/access/Makefile.am |    9 ++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index d04acd0..44931b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1947,13 +1947,14 @@ fi
 dnl
 dnl QTKit
 AC_ARG_ENABLE(macosx-qtkit,
-  [  --enable-macosx-qtkit Mac OS X qtsound (audio) module (default enabled on Mac OS X)])
+  [  --enable-macosx-qtkit Mac OS X qtsound (audio) module (default enabled on Mac OS X <= v10.11)])
 if test "x${enable_macosx_qtkit}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_qtkit}" = "yes")
 then
-  VLC_ADD_PLUGIN([qtsound])
+  AC_CHECK_HEADERS(QTKit/QTKit.h, [
+      VLC_ADD_PLUGIN([qtsound])
+    ])
 fi
-AM_CONDITIONAL(HAVE_QTKIT, [test "${SYS}" = "darwin" -a "x${enable_macosx_qtkit}" != "xno"])
 
 dnl
 dnl AVFoundation
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 891b1eb..8ddc53d 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -103,11 +103,10 @@ if HAVE_PULSE
 access_LTLIBRARIES += libpulsesrc_plugin.la
 endif
 
-libqtsound_plugin_la_SOURCES = access/qtsound.m
-libqtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
-if HAVE_QTKIT
-access_LTLIBRARIES += libqtsound_plugin.la
-endif
+libaccess_qtsound_plugin_la_SOURCES = access/qtsound.m
+libaccess_qtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
+access_LTLIBRARIES += $(LTLIBaccess_qtsound)
+EXTRA_LTLIBRARIES += libaccess_qtsound_plugin.la
 
 libaccess_wasapi_plugin_la_SOURCES = access/wasapi.c
 libaccess_wasapi_plugin_la_LIBADD = -lole32 -lksuser