* configure.ac : Build dvb as built-in when using --with-dvbpsi-tree. This

   fixes dvb on x86_64 architecture.

diff --git a/configure.ac b/configure.ac
index dfd68ed32e8affc2581f738198a377c9e129d441..8f7789762da2e103a188ade23b5ae54e64c64994 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1758,7 +1758,12 @@ then
   fi
   CPPFLAGS="${CPPFLAGS_save} -I${with_dvb}/include"
   AC_CHECK_HEADERS(linux/dvb/version.h linux/dvb/frontend.h, [
-    VLC_ADD_PLUGINS([dvb])
+    if test -z "${with_dvbpsi_tree}"
+    then
+      VLC_ADD_PLUGINS([dvb])
+    else
+      VLC_ADD_BUILTINS([dvb])
+    fi
   ],[])
   CPPFLAGS="${CPPFLAGS_save}"
 fi