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

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Aug  8 00:01:39 2018 +0200| [69dd0cb61abb66be4ca0a473391e856a5abad4e9] | 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.

(cherry picked from commit 0d181b4172cdeb5bd39b059253b4f8a4da7d0db7)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>

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

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

diff --git a/configure.ac b/configure.ac
index 1af57da606..2ed758a3ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2010,9 +2010,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 c6d66ab066..22ab19bbca 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -75,7 +75,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