[vlc-commits] Check for Linux DVB version 5

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 31 17:06:50 2011 +0300| [6c99941fb55b8d88c60cbb1c273ec88cbc92d437] | committer: Rémi Denis-Courmont

Check for Linux DVB version 5

This should fix compilation with kernel headers 2.6.27 and older
(obviously not tested).

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

 configure.ac              |   15 +++++++++++++++
 modules/access/Modules.am |    2 +-
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index bcd74f4..3e6974b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2127,6 +2127,21 @@ then
 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
 have_dvbpsi="no"
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 2db7a4c..e27a5db 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -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