Merge branch 'master' into lpcm_encoder

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 28f9d0d92464925612692c5021e6d98aa27159bb..8fa684aab396e022c211ad9d6853289dcab4d596 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2134,23 +2134,23 @@ then
 fi
 
 dnl
-dnl special access module for BlackMagic SDI cards
+dnl special access module for Blackmagic SDI cards
 dnl
-AC_ARG_ENABLE(sdi,
-  [  --enable-sdi            BlackMagic SDI access module (default disabled)])
-if test "${enable_sdi}" = "yes"
+AC_ARG_ENABLE(decklink,
+  [  --enable-decklink       Blackmagic DeckLink SDI access module (default enabled)])
+if test "${enable_decklink}" != "no"
 then
-  AC_ARG_WITH(sdi_sdk,
-    [  --with-sdi-sdk=DIR      Location of BlackMagic SDI SDK],[],[])
-  if test "${with_sdi_sdk}" != "no" -a -n "${with_sdi_sdk}"
+  AC_ARG_WITH(decklink_sdk,
+    [  --with-decklink-sdk=DIR      Location of Blackmagic DeckLink SDI SDK],[],[])
+  if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
   then
-    VLC_ADD_CPPFLAGS([sdi],[-I${with_sdi_sdk}/include])
+    VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include])
   fi
-  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_sdi}"
+  CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_decklink}"
   AC_LANG_PUSH(C++)
   AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
-    VLC_ADD_PLUGIN([sdi])
-  ],[AC_MSG_WARN(BlackMagic SDI include files not found, sdi disabled)])
+    VLC_ADD_PLUGIN([decklink])
+  ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)])
   AC_LANG_POP(C++)
   CPPFLAGS="${CPPFLAGS_save}"
 fi