Commit 33cb3119 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files

configure: remove dvb-check and enable ts demux/muxer if dvbpsi is present

dtv is build automaticly and we anyway assume new enough libdvbpsi that has
pkg-config enabled. Also ts demux wasn't build automaticly previously (as
dvb was disabled by default some time ago).
parent 6c12d019
...@@ -1948,42 +1948,6 @@ if test "${enable_sftp}" = "yes"; then ...@@ -1948,42 +1948,6 @@ if test "${enable_sftp}" = "yes"; then
]) ])
fi fi
dnl
dnl libdvbpsi ts demux/mux
dnl
AC_ARG_ENABLE(dvb,
[ --enable-dvb MPEG-TS and DVB support (default auto)])
have_dvbpsi=no
AS_IF([test "${enable_dvb}" != "no"], [
AC_CHECK_HEADERS([dvbpsi/dr.h],[
VLC_ADD_PLUGIN([ts])
if test "${enable_sout}" != "no"; then
AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor, [VLC_ADD_PLUGIN([mux_ts])], [], [-ldvbpsi])
fi
VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi])
have_dvbpsi=yes
AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [
AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.])
], [], [${LIBS_ts}])
],[
AS_IF([test -n "${enable_dvb}"], [
AC_MSG_ERROR([Could not find libdvbpsi on your system: you need at least version 0.1.6])
], [
AC_MSG_WARN([Could not find libdvbpsi on your system: you need at least version 0.1.6])
])
],[ #if defined( HAVE_STDINT_H )
# include <stdint.h>
#elif defined( HAVE_INTTYPES_H )
# include <inttypes.h>
#endif
#include <dvbpsi/dvbpsi.h>
#include <dvbpsi/descriptor.h>
#include <dvbpsi/pat.h>
#include <dvbpsi/pmt.h>
])
])
dnl dnl
dnl Video4Linux2 plugin dnl Video4Linux2 plugin
dnl dnl
...@@ -2139,13 +2103,15 @@ then ...@@ -2139,13 +2103,15 @@ then
fi fi
dnl dnl
dnl DVB-S/DVB-T/DVB-C satellite/teresterial/cable input dnl libdvbpsi check for ts mux/demux
dnl dnl
AS_IF([test "${have_dvbpsi}" = "yes" ], [ PKG_WITH_MODULES([DVBPSI], [libdvbpsi],
AC_CHECK_HEADER([linux/dvb/version.h], [ VLC_ADD_PLUGIN([ts])
VLC_ADD_PLUGIN([dvb]) if test "${enable_sout}" != "no"; then
]) VLC_ADD_PLUGIN([mux_ts])
]) VLC_ADD_LIBS([mux_ts],[-ldvbpsi])
fi
)
dnl dnl
dnl Screen capture module dnl Screen capture module
...@@ -4243,7 +4209,6 @@ AC_CONFIG_FILES([ ...@@ -4243,7 +4209,6 @@ AC_CONFIG_FILES([
modules/access/Makefile modules/access/Makefile
modules/access/bd/Makefile modules/access/bd/Makefile
modules/access/dshow/Makefile modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile modules/access/mms/Makefile
modules/access/rtp/Makefile modules/access/rtp/Makefile
modules/access/rtsp/Makefile modules/access/rtsp/Makefile
......
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