[vlc-commits] decklink: fix flags

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Mar  6 13:18:21 2013 +0100| [72a86d898bf4396881a895e37385e246541579e8] | committer: Rafaël Carré

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

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

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

diff --git a/configure.ac b/configure.ac
index e35bf27..cdb70cc 100644
--- 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 9722720..1207263 100644
--- 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 aa05454..db20784 100644
--- 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