]> git.sesse.net Git - vlc/commitdiff
Check for Linux DVB version 5
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 31 Aug 2011 14:06:50 +0000 (17:06 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 31 Aug 2011 21:02:16 +0000 (00:02 +0300)
This should fix compilation with kernel headers 2.6.27 and older
(obviously not tested).

configure.ac
modules/access/Modules.am

index bcd74f4cec26fb0b20e41ca6def7eaff7968aa14..3e6974bcad25d3c5fef3d5a3fbfd937bc7debb25 100644 (file)
@@ -2126,6 +2126,21 @@ then
   fi
 fi
 
+dnl
+dnl Linux DVB
+dnl
+AC_CACHE_CHECK([for Linux DVB version 5], [ac_cv_linux_s2api], [
+  AC_PREPROC_IFELSE([AC_LANG_PROGRAM([
+[#include <linux/dvb/version.h>
+#if (DVB_API_VERSION < 5)
+EXPLODE
+#endif]])], [
+  ac_cv_linux_s2api=yes
+], [
+  ac_cv_linux_s2api=no
+])])
+AM_CONDITIONAL([HAVE_LINUX_DVB], [test "$ac_cv_linux_s2api" = no])
+
 dnl
 dnl  libdvbpsi check for ts mux/demux
 dnl
index 2db7a4ccfd18f1b3501abb95e8fe972fdf9e57d7..e27a5db86c40d7eddad0f5d16729f0a95d737f0c 100644 (file)
@@ -158,7 +158,7 @@ libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdtv_plugin_la_LIBADD = $(AM_LIBADD)
 libdtv_plugin_la_DEPENDENCIES =
 
-if HAVE_LINUX
+if HAVE_LINUX_DVB
 libdtv_plugin_la_SOURCES += dtv/linux.c
 if HAVE_DVBPSI
 libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h