decklink: fix flags

-I must be set in CPPFLAGS
Fixes the following message in configure:
checking DeckLinkAPIDispatch.cpp usability... yes
checking DeckLinkAPIDispatch.cpp presence... no

diff --git a/configure.ac b/configure.ac
index e35bf2747ad0428406f96b111ec73c7bce683615..cdb70ccf1c6c3f652de209d3f31cd5188ab9877e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1760,10 +1760,10 @@ if test "${enable_decklink}" != "no"
 then
   if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
   then
-    VLC_ADD_CXXFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include])
+    VLC_ADD_CPPFLAGS([decklink decklinkoutput],[-I${with_decklink_sdk}/include])
   fi
   VLC_SAVE_FLAGS
-  CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}"
+  CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}"
   AC_LANG_PUSH(C++)
   AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
       have_decklink=yes

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 9722720380764fbbaf9f51db510fa1a07dc056d4..1207263b8a2e2dded95bbcee203e94e9c67bc971 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -64,7 +64,7 @@ SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c
 
 if HAVE_DECKLINK
 libdecklink_plugin_la_SOURCES = decklink.cpp
-libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklink)
+libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
 libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
 libvlc_LTLIBRARIES += libdecklink_plugin.la
 endif

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index aa05454d592bcba915778e0ac71ab319d3c70c40..db207849545397dad465a63bb8a42e1c35a1a290 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -12,7 +12,7 @@ SOURCES_android_surface = androidsurface.c
 
 if HAVE_DECKLINK
 libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
-libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklinkoutput)
+libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
 libdecklinkoutput_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) $(LIBDL)
 libvlc_LTLIBRARIES += libdecklinkoutput_plugin.la
 endif