Commit e8bb7eae authored by Christophe Mutricy's avatar Christophe Mutricy Committed by Jean-Baptiste Kempf

dvb access needs dvbpsi

(cherry picked from commit f74d2ab5)
parent de4c527a
...@@ -2262,6 +2262,7 @@ dnl libdvbpsi ts demux/mux ...@@ -2262,6 +2262,7 @@ dnl libdvbpsi ts demux/mux
dnl dnl
AC_ARG_ENABLE(dvbpsi, AC_ARG_ENABLE(dvbpsi,
[ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)]) [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)])
have_dvbpsi=no
if test "${enable_dvbpsi}" != "no" if test "${enable_dvbpsi}" != "no"
then then
AC_ARG_WITH(dvbpsi, AC_ARG_WITH(dvbpsi,
...@@ -2277,7 +2278,8 @@ then ...@@ -2277,7 +2278,8 @@ then
if test "${enable_sout}" != "no"; then if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGIN([mux_ts]) VLC_ADD_PLUGIN([mux_ts])
fi fi
VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi]) ], VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi])
have_dvbpsi=yes],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
[#if defined( HAVE_STDINT_H ) [#if defined( HAVE_STDINT_H )
# include <stdint.h> # include <stdint.h>
...@@ -2307,6 +2309,7 @@ then ...@@ -2307,6 +2309,7 @@ then
fi fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src]) VLC_ADD_CPPFLAGS([mux_ts ts dvb],[-I${real_dvbpsi_tree}/src])
VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a]) VLC_ADD_LIBS([mux_ts ts dvb],[${real_dvbpsi_tree}/src/.libs/libdvbpsi.a])
have_dvbpsi=yes
else else
dnl The given libdvbpsi wasn't built dnl The given libdvbpsi wasn't built
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
...@@ -2335,7 +2338,7 @@ then ...@@ -2335,7 +2338,7 @@ then
fi fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}]) VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi]) VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
have_dvbpsi=yes
],[ ],[
if test -n "${enable_dvbpsi}" if test -n "${enable_dvbpsi}"
then then
...@@ -2624,6 +2627,7 @@ AC_ARG_ENABLE(dvb, ...@@ -2624,6 +2627,7 @@ AC_ARG_ENABLE(dvb,
if test "${enable_dvb}" != "no" if test "${enable_dvb}" != "no"
then then
AS_IF([test "${have_dvbpsi}" = "yes" ],[
AC_ARG_WITH(dvb, AC_ARG_WITH(dvb,
[ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[]) [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
if test "${with_dvb}" != "no" -a -n "${with_dvb}" if test "${with_dvb}" != "no" -a -n "${with_dvb}"
...@@ -2635,6 +2639,9 @@ then ...@@ -2635,6 +2639,9 @@ then
VLC_ADD_PLUGIN([dvb]) VLC_ADD_PLUGIN([dvb])
],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)]) ],[AC_MSG_WARN(linux-dvb headers not found, dvb disabled)])
CPPFLAGS="${CPPFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}"
],[
AC_MSG_WARN([the dvb access module requires libdvbpsi])
])
fi fi
dnl dnl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment