dnl
dnl OpenCV wrapper and example filters
dnl
-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example], [opencv], (OpenCV (computer vision) filter), [off])
+PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [off])
dnl
dnl libdvbpsi ts demux/mux
dnl
AC_ARG_ENABLE(dvbpsi,
- [ --enable-dvbpsi dvbpsi ts mux and demux module (default enabled)])
+ [ --enable-dvbpsi dvbpsi ts mux and demux module (default auto)])
have_dvbpsi=no
-if test "${enable_dvbpsi}" != "no"
-then
- AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi=PATH libdvbpsi headers and libraries])
- AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
- case "${with_dvbpsi}" in
- ""|yes)
- if test -z "${with_dvbpsi_tree}"
- then
- AC_CHECK_HEADERS(dvbpsi/dr.h,
- [ VLC_ADD_PLUGIN([ts])
- if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
- fi
- VLC_ADD_LIBS([mux_ts ts dvb],[-ldvbpsi])
- have_dvbpsi=yes],
- [ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
- [#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>])
- else
- AC_MSG_CHECKING(for libdvbpsi.a in ${with_dvbpsi_tree})
- real_dvbpsi_tree="`cd ${with_dvbpsi_tree} 2>/dev/null && pwd`"
- if test -z "${real_dvbpsi_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_dvbpsi_tree}])
- fi
- if test -f "${real_dvbpsi_tree}/src/.libs/libdvbpsi.a"
- then
- dnl Use a custom libdvbpsi
- AC_MSG_RESULT(${real_dvbpsi_tree}/src/.libs/libdvbpsi.a)
- VLC_ADD_PLUGIN([ts])
- if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
- fi
- 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])
- have_dvbpsi=yes
- else
- dnl The given libdvbpsi wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_dvbpsi_tree}/src/.libs/libdvbpsi.a, make sure you compiled libdvbpsi in ${with_dvbpsi_tree}])
- fi
- fi
- ;;
- no)
- dnl Compile without dvbpsi
- ;;
- *)
- AC_MSG_CHECKING(for dvbpsi headers in ${with_dvbpsi})
- if test -z "${with_dvbpsi}"
- then
- LDFLAGS_test=""
- CPPFLAGS_test=""
- else
- LDFLAGS_test="-L${with_dvbpsi}/lib"
- CPPFLAGS_test="-I${with_dvbpsi}/include"
- fi
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test}"
+if test "${enable_dvbpsi}" != "no"; then
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])], [], [${LDFLAGS_test} -ldvbpsi])
+ AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor, [VLC_ADD_PLUGIN([mux_ts])], [], [-ldvbpsi])
fi
- 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],[-ldvbpsi])
have_dvbpsi=yes
+
+ AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [
+ AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.])
+ ], [], [${LIBS_ts}])
],[
- if test -n "${enable_dvbpsi}"
- then
- AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
+ if test -n "${enable_dvbpsi}"; then
+ AC_MSG_ERROR([Could not find libdvbpsi on your system: you need at least version 0.1.6])
+ else
+ AC_MSG_WARN([Could not find libdvbpsi on your system: you need at least version 0.1.6])
fi
- ],
- [#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>])
- CPPFLAGS="${CPPFLAGS_save}"
- ;;
- esac
- AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [
- AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.])
- ], [], [${LIBS_ts}])
-
+ ],[ #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>
+ ])
fi
dnl
dnl CrystalHD codec plugin
dnl
AC_ARG_ENABLE(crystalhd,
- [ --enable-crystalhd crystalhd codec plugin (default disabled)])
-if test "${enable_crystalhd}" == "yes"; then
+ [ --enable-crystalhd crystalhd codec plugin (default auto)])
+if test "${enable_crystalhd}" != "no"; then
AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [
VLC_ADD_PLUGIN([crystalhd])
VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
VLC_ADD_LIBS([crystalhd], [-lbcmDIL])
])
],[
- AC_MSG_ERROR("Could not find CrystalHD development headers")
+ AS_IF([test x"${enable_crystalhd}" = "xyes"],
+ [AC_MSG_ERROR("Could not find CrystalHD development headers")],
+ [AC_MSG_WARN("Could not find CrystalHD development headers")])
+ ],[#define __LINUX_USER__
+ #include <libcrystalhd/bc_dts_types.h>
])
fi
- ],[#define __LINUX_USER__
+ ],[
#include <libcrystalhd/bc_dts_types.h>
])
fi
enable_xvideo="$enable_xcb"
])
-need_xid_provider="no"
have_xcb="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
], [
- need_xid_provider="yes"
- AC_MSG_WARN([libxcb-keysyms (0.3.4 or later) not found. Hotkeys will work.])
+ AC_MSG_WARN([libxcb-keysyms (0.3.4 or later) not found. Hotkeys will not work.])
])
])
AM_CONDITIONAL([HAVE_XCB], [test "${have_xcb}" = "yes"])
])
VLC_ADD_PLUGIN([xcb_glx])
])
-AC_SUBST([GL_CFLAGS])
-AC_SUBST([GL_LIBS])
dnl
dnl OpenGL
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11])
- need_xid_provider="no"
])
VLC_ADD_PLUGIN([skins2])
VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_PLUGIN([hildon])
ALIASES="${ALIASES} mvlc"
- need_xid_provider="no"
], [
AS_IF([test "${enable_hildon}" = "yes"],[
AC_MSG_ERROR([Hildon libraries not found])
], [
AC_MSG_RESULT([yes])
VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
- need_xid_provider="no"
VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
], [
AC_MSG_RESULT([no])
])
fi
-dnl
-dnl Post-interface configuration checks
-dnl
-AS_IF([test "$need_xid_provider" = "yes"], [
- AC_MSG_ERROR([X11 video outputs need a window provider (Qt4, Skins2, Hildon or xcb-utils), but none were found. Please install xcb-keysyms.])
-])
-
dnl
dnl Visualisation plugin
dnl
dnl pkg-config --libs gnutls omits these
VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}])
])
- dnl The GnuTLS plugin invokes gcry_control directly.
- AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}])
- VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}])
- ])
+ VLC_ADD_LIBS([gnutls], [${GCRYPT_LIBS}])
+ VLC_ADD_CFLAGS([gnutls], [${GCRYPT_CFLAGS}])
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)])
if test "${enable_media_library}" == "yes"; then
if test "${enable_sqlite}" != "yes"; then
- if test "${enable_media_library}" == "yes"; then
- AC_MSG_ERROR([SQLite module is required for the media library])
- else
- AC_MSG_WARN([SQLite module is required for the media library])
- fi
+ AC_MSG_ERROR([SQLite module is required for the media library])
else
AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library])
VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY")
modules/access/zip/Makefile
modules/access_output/Makefile
modules/audio_filter/Makefile
- modules/audio_filter/channel_mixer/Makefile
- modules/audio_filter/converter/Makefile
- modules/audio_filter/resampler/Makefile
- modules/audio_filter/spatializer/Makefile
modules/audio_mixer/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
+ modules/lua/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
- modules/misc/lua/Makefile
modules/misc/notify/Makefile
modules/misc/playlist/Makefile
modules/misc/osd/Makefile
projects / vlc / blobdiff