X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6efa99b3188f67a6a167a59e3b8b0ab5d31db67e;hb=5ac9e88e16f22b8fb82adba43cfd89b5302f20bc;hp=40a9029a0f6e7ba866cd6841f8a00675288f6712;hpb=5824aabb9f5694ea7f35929e84b0630fb390683b;p=vlc

diff --git a/configure.ac b/configure.ac
index 40a9029a0f..6efa99b318 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,7 +353,7 @@ case "${host_os}" in
         dnl DEP and ASLR options
         dnl
         AC_ARG_ENABLE(peflags,
-          [  --enable-peflags        peflags use (default enabled)])
+          [  --enable-peflags        peflags use (default enabled on Windows)])
         if test "${enable_peflags}" != "no"
         then
           AC_CHECK_TOOL(PEFLAGS, peflags, :)
@@ -2321,7 +2321,8 @@ then
     AC_CHECK_HEADERS([dvbpsi/dr.h],[
       VLC_ADD_PLUGIN([ts])
       if test "${enable_sout}" != "no"; then
-        VLC_ADD_PLUGIN([mux_ts])
+        AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor,
+           [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi])
       fi
       VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
       VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
@@ -2329,7 +2330,7 @@ then
     ],[
       if test -n "${enable_dvbpsi}"
       then
-        AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
+        AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
       fi
     ],
     [#if defined( HAVE_STDINT_H )
@@ -2977,10 +2978,46 @@ AS_IF([test "${enable_libva}" != "no"], [
               [AC_MSG_WARN([libva not found  ])])
       ])
   ],[
-    AC_MSG_ERROR([libva VAAPI support depends on libavcodec. You cannot use --disable-avcodec.])
+    AS_IF([test "x${enable_libva}" != "x"], [
+      AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
+    ])
+  ])
+])
+
+dnl
+dnl dxva2 needs avcodec
+dnl
+AC_ARG_ENABLE(dxva2,
+  [  --enable-dxva2          DxVA2  support (default auto)])
+
+AS_IF([test "${enable_dxva2}" != "no"], [
+  if test "${SYS}" = "mingw32"; then
+  AS_IF([test "x${have_avcodec}" = "xyes"], [
+    AC_CHECK_HEADERS(dxva2api.h, 
+      [
+        AC_CHECK_HEADERS(libavcodec/dxva2.h, [
+           VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid])
+           AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+           echo "DxVA2 acceleration activated"
+        ],[
+	AS_IF([test "${enable_dxva2}" == "yes"],
+	      [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
+              [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
+        ])
+      ],[
+	AS_IF([test "${enable_dxva2}" == "yes"],
+              [AC_MSG_ERROR([Could not find required dxva2api.h])],
+              [AC_MSG_WARN([dxva2api.h not found])])
+      ])
+  ],[
+    AS_IF([test "x${enable_dxva2}" != "x"], [
+      AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
+    ])
   ])
+  fi
 ])
 
+
 dnl
 dnl stream_out switcher needs libavcodec
 dnl
@@ -4003,7 +4040,7 @@ fi
 dnl
 dnl  libcaca plugin
 dnl
-PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto])
 
 dnl
 dnl  Audio plugins
@@ -4640,7 +4677,7 @@ dnl
 AC_ARG_WITH(sqlite,
   [  --with-sqlite=PATH      sqlite path linking])
 if test "${SYS}" != "darwin"; then
-  PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+  PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto])
 else
   if test "${enable_sqlite}" != "no"
   then