[vlc-commits] qtsound: Fix configure detection and build

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Aug  8 00:01:39 2018 +0200| [0d181b4172cdeb5bd39b059253b4f8a4da7d0db7] | committer: David Fuhrmann

qtsound: Fix configure detection and build

QTKit header includes objc header files, therefore the configure
check must be done with an objc file. Also, fix build of qtsound
module.

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

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

diff --git a/configure.ac b/configure.ac
index 5c30b99963..1627c12b79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2018,9 +2018,11 @@ AC_ARG_ENABLE(macosx-qtkit,
 if test "x${enable_macosx_qtkit}" != "xno" &&
   (test "${SYS}" = "darwin" || test "${enable_macosx_qtkit}" = "yes")
 then
+  AC_LANG_PUSH([Objective C])
   AC_CHECK_HEADERS(QTKit/QTKit.h, [
-      VLC_ADD_PLUGIN([qtsound])
+      VLC_ADD_PLUGIN([access_qtsound])
     ])
+  AC_LANG_POP([Objective C])
 fi
 
 dnl
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 3ad3e57aa2..ee4290132f 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -72,7 +72,7 @@ access_LTLIBRARIES += libpulsesrc_plugin.la
 endif
 
 libaccess_qtsound_plugin_la_SOURCES = access/qtsound.m
-libaccess_qtsound_plugin_la_LDFLAGS = -Wl,-framework,QTKit -Wl,-framework,CoreAudio
+libaccess_qtsound_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' -Wl,-framework,Foundation -Wl,-framework,QTKit -Wl,-framework,CoreAudio
 access_LTLIBRARIES += $(LTLIBaccess_qtsound)
 EXTRA_LTLIBRARIES += libaccess_qtsound_plugin.la