[vlc-devel] [PATCH] configure: only enable the DShow access module if it can be compiled

Steve Lhomme robux4 at videolabs.io
Tue Jul 4 18:24:23 CEST 2017


Old Ubuntu mingw don't have this header
---
 configure.ac               | 7 +++++++
 modules/access/Makefile.am | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 8ef7bbcd96..331f8b65b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1982,6 +1982,13 @@ if test "${enable_realrtsp}" = "yes"; then
 fi
 
 dnl
+dnl  Access DShow
+dnl
+AC_CHECK_HEADERS(wrl/client.h, [
+  VLC_ADD_PLUGIN([dshow])
+])
+
+dnl
 dnl QTKit
 AC_ARG_ENABLE(macosx-qtkit,
   [  --enable-macosx-qtkit Mac OS X qtsound (audio) module (default enabled on Mac OS X <= v10.11)])
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index dd485a2767..ac42947b49 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -159,7 +159,7 @@ libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp acc
 	access/dshow/filter.cpp access/dshow/filter.h access/dshow/crossbar.cpp
 libdshow_plugin_la_LIBADD = $(LIBCOM) -loleaut32 -luuid -lstrmiids -lksuser
 if HAVE_WIN32_DESKTOP
-access_LTLIBRARIES += libdshow_plugin.la
+access_LTLIBRARIES += $(LTLIBdshow)
 endif
 
 
-- 
2.12.1



More information about the vlc-devel mailing list