VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap oldhttp stream_out_standard stream_out_select stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
VLC_ADD_LIBS([filesystem], [-lshlwapi])
dnl
dnl DEP and ASLR options
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_select stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_wince"
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
- AC_CHECK_HEADERS(libcrystalhd/libcrystalhd_if.h, [
+ [ --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
- ])
+ ],[
+ #include <libcrystalhd/bc_dts_types.h>
+ ])
fi
dnl
VLC_ADD_PLUGIN([access_realrtsp])
fi
-dnl
-dnl skins2 module
-dnl
-AC_ARG_ENABLE(libtar,
- [ --enable-libtar libtar support for skins2 (default enabled)])
-
-AS_IF([test "${enable_libtar}" != "no"],[
- AC_CHECK_HEADERS(libtar.h, [
- VLC_ADD_LIBS([skins2],[-ltar])
- ] )
-])
-
dnl
dnl A52/AC3 decoder plugin
dnl
enable_xvideo="$enable_xcb"
])
-need_xid_provider="no"
have_xcb="no"
AS_IF([test "${enable_xcb}" != "no"], [
dnl libxcb
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
VLC_ADD_PLUGIN([xcb_xv])
- ], [
- PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [
- VLC_ADD_PLUGIN([xcb_xv])
- VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD])
- ])
])
])
dnl xcb-utils
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
- have_xcb_keysyms="yes"
- ], [
- PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
- have_xcb_keysyms="yes"
- VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API])
- ], [
- have_xcb_keysyms="no"
- need_xid_provider="yes"
- AC_MSG_WARN([libxcb-keysyms not found. Hotkeys will not be supported.])
- ])
- ])
-
- AS_IF([test "${have_xcb_keysyms}" = "yes"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
+ ], [
+ 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 EGL
+dnl OpenGL
dnl
-AC_ARG_ENABLE(egl,
- [ --enable-egl EGL support (default disabled)],, [
- enable_egl="no"
-])
-AS_IF([test "${enable_egl}" != "no"], [
- PKG_CHECK_MODULES(EGL, [egl])
- VLC_ADD_PLUGIN([egl])
-])
+PKG_ENABLE_MODULES_VLC([GL], [], [gl], [OpenGL support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES1], [], [glesv1_cm], [OpenGL ES v1 support], [auto])
+PKG_ENABLE_MODULES_VLC([GLES2], [], [glesv2], [OpenGL ES v2 support], [auto])
+PKG_ENABLE_MODULES_VLC([EGL], [], [egl], [EGL support], [auto])
dnl
dnl SDL module
VLC_ADD_LDFLAGS([audioqueue], [-Wl,-framework,AudioToolbox,-framework,CoreFoundation])
fi
-dnl
-dnl Roku HD1000 audio
-dnl
-AC_ARG_ENABLE(hd1000a,
- [ --enable-hd1000a HD1000 audio module (default enabled on HD1000)])
-if test "${enable_hd1000a}" != "no" -a "${CXX}" != "" &&
- (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
- test "${enable_hd1000a}" = "yes")
-then
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS(deschutes/libraries/hdmachinex225/PCMAudioPlayer.h, [
- VLC_ADD_PLUGIN([hd1000a])
- AC_CHECK_LIB(HDMachineX225,main,VLC_ADD_LIBS([hd1000a],[-lHDMachineX225])) ])
- AC_LANG_POP([C++])
-fi
-
dnl
dnl JACK modules
dnl
dnl
dnl UPnP Plugin (Intel SDK)
dnl
-PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-VLC_ADD_CXXFLAGS([upnp_intel],[${UPNP_CFLAGS}])
+PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto])
+VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}])
dnl
dnl Interface plugins
dnl
dnl Skins2 module
dnl
+AC_ARG_ENABLE(libtar,
+ [ --enable-libtar libtar support for skins2 (default auto)])
+AS_IF([test "${enable_libtar}" != "no"], [
+ AC_CHECK_HEADERS(libtar.h, [
+ VLC_ADD_LIBS([skins2],[-ltar])
+ ])
+])
+
AC_ARG_ENABLE(skins2,
[AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default
- enabled except on MacOSX and WinCE)])])
-if test "${enable_skins2}" != "no" ||
- (test "${SYS}" != "darwin" &&
- test "${SYS}" != "mingwce" && test "${enable_skins2}" == "yes"); then
-
- dnl test for the required libraries
- skins2_missing_lib="no"
-
+ enabled except on MacOSX and WinCE)])],, [
+ AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [
+ enable_skins2="yes"
+ ], [
+ enable_skins2="no"
+ ])
+])
+AS_IF([test "${enable_skins2}" = "yes"], [
dnl freetype
- if test "${have_freetype}" != "yes"; then
- skins2_missing_lib="yes"
- if test "${enable_skins2}" = "yes"; then
- AC_MSG_ERROR([Could not find freetype (required for skins2)])
- fi
- fi
+ AS_IF([test "${have_freetype}" != "yes"], [
+ AC_MSG_ERROR([Could not find FreeType (required for skins2)])
+ ])
- if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32"); then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
+ AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32])
- else if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "darwin"); then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
+ ], [test "${SYS}" = "darwin"], [
VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
VLC_ADD_LDFLAGS([skins2],[-Wl,-framework,Carbon])
- else if test "${skins2_missing_lib}" = "no"; then
- VLC_ADD_PLUGIN([skins2])
- ALIASES="${ALIASES} svlc"
- VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} -DX11_SKINS])
+ ], [
+ PKG_CHECK_MODULES([XPM], [xpm])
+ PKG_CHECK_MODULES([XEXT], [xext])
+ 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} -lXext -lXpm -lX11])
- need_xid_provider="no"
- fi fi fi
-fi
-AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" ||
- (test "${SYS}" != "darwin" &&
- test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
+ VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} -lX11])
+
+ ])
+ VLC_ADD_PLUGIN([skins2])
+ ALIASES="${ALIASES} svlc"
+])
+AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
dnl
dnl Hildon UI
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"], [
dnl
dnl RemoteOSD plugin (VNC client as video filter)
dnl
-AC_ARG_ENABLE(remoteosd,
- [ --disable-remoteosd RemoteOSD plugin (default enabled)])
-
-AS_IF([test "${enable_remoteosd}" != "no"], [
- AS_IF([test "${have_libgcrypt}" = "yes"],[
- VLC_ADD_PLUGIN([remoteosd])
- VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
- VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
- ], [
- AC_MSG_ERROR([libgcrypt support required for RemoteOSD plugin])
- ])
+AC_MSG_CHECKING([whether to enable the RemoteOSD plugin])
+AS_IF([test "${have_libgcrypt}" = "yes"],[
+ AC_MSG_RESULT(yes)
+ VLC_ADD_PLUGIN([remoteosd])
+ VLC_ADD_LIBS([remoteosd], ${GCRYPT_LIBS})
+ VLC_ADD_CFLAGS([remoteosd], ${GCRYPT_CFLAGS})
+], [
+ AC_MSG_RESULT(no)
+ AC_MSG_WARN([libgcrypt support required for RemoteOSD plugin])
])
dnl
dnl RAOP plugin
dnl
-AC_MSG_CHECKING([whether to enable RAOP plugin])
+AC_MSG_CHECKING([whether to enable the RAOP plugin])
AS_IF([test "${have_libgcrypt}" = "yes"], [
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([stream_out_raop])
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