X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=925fd142bd8d08db0aa0a8f57710875e5315dc6b;hb=554f76adfa055ffac630de9d06bb7caae6c4c146;hp=89dce2be63cad84350aa458b13572626691b981e;hpb=fd42ed01aa615c731e681d86c9732e07b7eaf278;p=vlc diff --git a/configure.ac b/configure.ac index 89dce2be63..925fd142bd 100644 --- a/configure.ac +++ b/configure.ac @@ -49,11 +49,6 @@ AC_SUBST(vlcdatadir) vlclibdir="\${libdir}/\${PKGDIR}" AC_SUBST(vlclibdir) -dnl -dnl Save *FLAGS -dnl -VLC_SAVE_FLAGS - dnl dnl Check for tools dnl @@ -75,18 +70,19 @@ AC_PROG_MAKE_SET AC_PROG_INSTALL AM_PROG_AS -dnl Find the right ranlib, even when cross-compiling -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) -AC_CHECK_TOOL(AR, ar, :) -AC_CHECK_TOOL(LD, ld, :) -AC_CHECK_TOOL(DLLTOOL, dlltool, :) +AC_ARG_VAR([DESKTOP_FILE_VALIDATE], [Validator for desktop entry files]) +AC_CHECK_PROGS(DESKTOP_FILE_VALIDATE, [${DESKTOP_FILE_VALIDATE} desktop-file-validate], :) dnl Check for compiler properties AC_C_CONST AC_C_INLINE AC_C_RESTRICT +dnl +dnl Save *FLAGS +dnl +VLC_SAVE_FLAGS + dnl Extend the --help string at the current spot. AC_DEFUN([EXTEND_HELP_STRING], [m4_divert_once([HELP_ENABLE], [$1])]) @@ -320,8 +316,8 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) - AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0501' for Windows XP APIs.]) - AC_DEFINE([_WIN32_IE], 0x0501, [Define to '0x0501' for IE 5.01 (and shell) APIs.]) + AC_DEFINE([_WIN32_WINNT], 0x0502, [Define to '0x0502' for Windows XP SP2 APIs.]) + AC_DEFINE([_WIN32_IE], 0x0600, [Define to '0x0600' for IE 6.0 (and shell) APIs.]) case "${host_os}" in *wince* | *mingwce* | *mingw32ce*) @@ -452,20 +448,16 @@ dnl fail on anything other than pass_all. AC_CACHE_VAL(lt_cv_deplibs_check_method, [lt_cv_deplibs_check_method=pass_all]) -AC_DISABLE_STATIC -dnl AC_DISABLE_FAST_INSTALL -AC_LIBTOOL_DLOPEN -AC_LIBTOOL_WIN32_DLL -m4_undefine([AC_PROG_F77]) -m4_defun([AC_PROG_F77],[]) -AC_PROG_LIBTOOL +LT_INIT([dlopen win32-dll shared disable-static]) +LT_LANG([C++]) +LT_LANG([Windows Resource]) m4_undefine([AC_DEPLIBS_CHECK_METHOD]) m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) lt_cv_deplibs_check_method=pass_all -AS_IF([test "${enable_shared}" = "no"], [ +AS_IF([test "${enable_shared}" = "no" -a "${enable_vlc}" != "no"], [ AC_MSG_ERROR([VLC is based on plugins. Shared libraries cannot be disabled.]) ]) @@ -474,14 +466,11 @@ dnl Gettext stuff dnl AM_GNU_GETTEXT_VERSION([0.18.1]) AM_GNU_GETTEXT([external]) -VLC_ADD_LIBS([libvlccore vlc], [${LTLIBINTL}]) dnl dnl Iconv stuff dnl AM_ICONV -VLC_ADD_CFLAGS([libvlccore],[${INCICONV}]) -VLC_ADD_LIBS([libvlccore],[${LTLIBICONV}]) dnl Check for broken versions of mingw-runtime compatability library AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ @@ -564,16 +553,13 @@ dnl Plugin compilation stuff VLC_LIBRARY_SUFFIX -dnl The -DSYS_FOO flag -CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcdefghijklmnopqrstuvwxyz.' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`"; CPPFLAGS="${CPPFLAGS_save}" - dnl Check for system libs needed need_libc=false dnl Check for usual libc functions AC_CHECK_DECLS([nanosleep],,,[#include ]) -AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale]) -AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) +AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp uselocale]) +AC_REPLACE_FUNCS([asprintf atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf]) AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) @@ -622,7 +608,7 @@ AC_SEARCH_LIBS(connect, [socket], [ ]) LIBS="$LIBS_save" AS_IF([test -n "$SOCKET_LIBS"], [ - VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap 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],[${SOCKET_LIBS}]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout sap stream_out_select stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldrc netsync gnutls flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[${SOCKET_LIBS}]) ]) AC_SUBST(SOCKET_LIBS) @@ -686,7 +672,7 @@ AC_CHECK_FUNC(getopt_long,, [ AC_SUBST(GNUGETOPT_LIBS) AC_CHECK_LIB(m,cos,[ - VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate libvlccore freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm]) + VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264],[-lm]) LIBM="-lm" ], [ LIBM="" @@ -699,50 +685,38 @@ AC_CHECK_LIB(m,lrintf, [ ]) dnl Check for dynamic plugins -ac_cv_have_plugins=no - -# Win32 style -if test "${ac_cv_have_plugins}" = "no"; then - if test "${SYS}" = "mingw32" ; then - AC_CHECK_LIB(kernel32, main, - [VLC_ADD_LIBS([libvlccore],[-lkernel32]) - ac_cv_have_plugins=yes]) - fi -fi - -# WinCE style -if test "${ac_cv_have_plugins}" = "no"; then - if test "${SYS}" = "mingwce"; then - ac_cv_have_plugins=yes - fi -fi - -# Only test for dlopen() if the others didn't work LIBDL="" -if test "${ac_cv_have_plugins}" = "no" -o "${SYS}" = "darwin"; then - AC_CHECK_HEADERS(dlfcn.h sys/dl.h) - ac_cv_my_have_dlopen=no - AC_CHECK_FUNC(dlopen, [ - ac_cv_my_have_dlopen=yes - ], [ - AC_CHECK_LIB(dl, dlopen, [ - ac_cv_my_have_dlopen=yes - LIBDL="-ldl" - ], [ - AC_CHECK_LIB(svld, dlopen, [ - ac_cv_my_have_dlopen=yes - LIBDL="-lsvld" - ]) - ]) +have_dynamic_objects="no" +LIBS_save="$LIBS" +AC_SEARCH_LIBS(dlopen, [dl svld], [ + AS_IF([test "$ac_cv_search_dlopen" != "none required"], [ + LIBDL="$ac_cv_search_dlopen" ]) - if test "${ac_cv_my_have_dlopen}" = "yes"; then - AC_DEFINE(HAVE_DL_DLOPEN, 1, [Define if you have the dlopen API]) - ac_cv_have_plugins=yes - VLC_ADD_LIBS([libvlccore realvideo lua],[$LIBDL]) - fi -fi + have_dynamic_objects="yes" +]) +LIBS="$LIBS_save" + +# Windows +AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ + LIBDL="" + have_dynamic_objects="yes" #assume we can use shared objects +]) + +test "${enable_shared}" = "no" && have_dynamic_objects=no + +AS_IF([test "${have_dynamic_objects}" != "no"], [ + AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, + [Define to 1 if dynamic plugins are supported.]) +], [ + dnl Clear $LIBDL so as not to break linking + LIBDL="" +]) +AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"]) + AC_SUBST(LIBDL) +VLC_ADD_LIBS([realvideo lua],[$LIBDL]) +dnl Check for thread library if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then dnl Check for pthreads - borrowed from XMMS THREAD_LIB=error @@ -827,9 +801,9 @@ AC_ARG_VAR(PKG_CONFIG_PATH, [Paths where to find .pc not at the default location]) PKG_PROG_PKG_CONFIG() -dnl On some OS we need static linking +dnl On some OS we need static linking AS_IF([test -n "${PKG_CONFIG}" ],[ - AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" ],[ + AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "darwin" -o "${SYS}" = "os2" ],[ PKG_CONFIG="${PKG_CONFIG} --static" ]) ]) @@ -844,19 +818,17 @@ if test "${have_zlib}" = "yes" then VLC_ADD_LIBS([access_http mp4 skins2 sap mkv unzip zip],[-lz]) PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ - AC_CHECK_HEADERS([unzip.h], [ + AC_CHECK_HEADERS([unzip.h], [ have_minizip=yes MINIZIP_LIBS="-lminizip -lz" ], [ have_minizip=no - MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip" - MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la" + MINIZIP_CFLAGS="-I\\\${top_srcdir}/modules/access/zip/unzip" + MINIZIP_LIBS="\\\${top_builddir}/modules/access/zip/unzip/libunzip.la" ]) ]) VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS]) - VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS]) - VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS]) - VLC_ADD_PLUGIN([unzip zip]) + VLC_ADD_LIBS([skins2],[$MINIZIP_LIBS]) fi AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) @@ -865,7 +837,7 @@ dnl Manual switch for UTF-8 AC_ARG_ENABLE(non-utf8, [AS_HELP_STRING([--enable-non-utf8], [support legacy non-UTF-8 systems (default disabled)])],, [ - AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [ + AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "os2"], [ enable_non_utf8="no" ]) ]) @@ -945,16 +917,12 @@ dnl Debugging mode dnl AC_ARG_ENABLE(debug, [AS_HELP_STRING([--enable-debug], - [build with run-time assertions and debug symbols (default disabled)])],, + [build with run-time assertions (default disabled)])],, [enable_debug="no"]) AH_TEMPLATE(NDEBUG, [Define to 1 if debug code should NOT be compiled]) AS_IF([test "${enable_debug}" != "no"], [ AC_CHECK_HEADERS([valgrind/valgrind.h]) - CFLAGS="${CFLAGS} -g" - CXXFLAGS="${CXXFLAGS} -g" - OBJCFLAGS="${OBJCFLAGS} -g" - LDFLAGS="${LDFLAGS} -g" ], [ AC_DEFINE(NDEBUG) ]) @@ -1059,33 +1027,6 @@ AS_IF([test "${enable_optimizations}" != "no"], [ ]) ]) - dnl -O2 and -O in both production and debug builds - AS_IF([test "x$C_O" = "x"], [ - AC_CACHE_CHECK([if \$CC accepts -O2], [ac_cv_c_o2], [ - CFLAGS="${CFLAGS_save} -O2" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ - ac_cv_c_o2=yes - ], [ - ac_cv_c_o2=no - ]) - ]) - AS_IF([test "${ac_cv_c_o2}" != "no"], [ - C_O="-O2" - ], [ - AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [ - CFLAGS="${CFLAGS_save} -O" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ - ac_cv_c_o=yes - ], [ - ac_cv_c_o=no - ]) - ]) - AS_IF([test "${ac_cv_c_o}" != "no"], [ - C_O="-O" - ]) - ]) - ]) - VLC_RESTORE_FLAGS CFLAGS="${CFLAGS} ${C_O}" CXXFLAGS="${CXXFLAGS} ${C_O}" @@ -1219,7 +1160,9 @@ ALIASES="${ALIASES} cvlc rvlc" dnl dnl Some plugins aren't useful on some platforms dnl -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then +if test "${SYS}" = "os2"; then + VLC_ADD_PLUGIN([dynamicoverlay]) +elif test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([dynamicoverlay access_shm]) elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([access_smb dmo globalhotkeys]) @@ -1677,6 +1620,7 @@ then fi AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"]) + dnl dnl HTTP daemon dnl @@ -1689,6 +1633,7 @@ then fi AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) + dnl dnl VideoLAN manager dnl @@ -1704,43 +1649,23 @@ AS_IF([test "${enable_vlm}" != "no"], [ ]) AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"]) -dnl -dnl Growl notification plugin -dnl -AC_ARG_ENABLE(growl, - [ --enable-growl growl notification plugin (default disabled)],, - [enable_growl=no]) -AS_IF([test "${enable_growl}" != "no"], [ - VLC_ADD_PLUGIN([growl_udp]) - AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ - VLC_ADD_PLUGIN([growl]) - VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) - VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) - VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) - ]) - ] -) - -dnl -dnl Libnotify notification plugin -dnl -PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto]) dnl -dnl Taglib plugin +dnl ipv6 support dnl -AC_ARG_ENABLE(taglib, - [AS_HELP_STRING([--disable-taglib], - [do not use TagLib (default enabled)])]) -AS_IF([test "${enable_taglib}" != "no"], [ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, [ - VLC_ADD_PLUGIN([taglib]) - VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) - VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) - ], [ - AC_MSG_WARN(TagLib library not found)]) +have_ipv6=no +AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ + AC_CHECK_LIB(nsl,inet_pton, [have_ipv6=yes]) ]) +AS_IF([test "${have_ipv6}" = "yes"], [ + AC_DEFINE(HAVE_INET_PTON, 1, [Define to 1 if you have inet_pton().])]) + + +AC_CHECK_FUNCS(inet_ntop,[ + AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have inet_ntop().])]) + + dnl dnl Input plugins dnl @@ -1859,8 +1784,8 @@ You can get an updated one from http://www.live555.com/liveMedia .]) AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. lternatively you can use --disable-live555 to disable the liveMedia plugin.]) ],[ - AC_MSG_RESULT([yes]) - ]) + AC_MSG_RESULT([yes]) + ]) ]) VLC_ADD_PLUGIN([live555]) @@ -1887,7 +1812,7 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.]) AC_MSG_RESULT(no) if test "${enable_live555}" = "yes"; then AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}]) - fi + fi fi fi fi @@ -2003,46 +1928,30 @@ if test "${enable_sftp}" = "yes"; then fi dnl -dnl Video4Linux2 plugin +dnl Video4Linux 2 dnl -AC_ARG_ENABLE(v4l2, - [AS_HELP_STRING([--disable-v4l2], - [disable Video4Linux2 support (default auto)])]) +AC_ARG_ENABLE(libv4l2, [AS_HELP_STRING([--disable-libv4l2], + [disable userspace V4L2 library (default auto)])]) +AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr], + [support PVR V4L2 cards (default disabled)])]) have_v4l2="no" -AS_IF([test "${enable_v4l2}" != "no"], [ - AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ - have_v4l2="yes" +AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [ + have_v4l2="yes" +]) +AS_IF([test "$have_v4l2" = "yes"], [ + AS_IF([test "${enable_libv4l2}" != "no"], [ + PKG_CHECK_MODULES(LIBV4L2, libv4l2, [ + AC_DEFINE(HAVE_LIBV4L2, 1, [Define to 1 if libv4l2 is available]) + ], [ + AC_MSG_WARN([${LIBV4L2_PKG_ERRORS}]) + ]) + ]) + AS_IF([test "${enable_pvr}" = "yes"], [ + VLC_ADD_PLUGIN([pvr]) ]) ]) AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"]) -dnl -dnl libv4l2 support for video4linux. -dnl -AC_ARG_ENABLE(libv4l2, - [AS_HELP_STRING([--enable-libv4l2], - [use V4L2 through libv4l2 (default auto)])]) -if test "${enable_libv4l2}" != "no" -a "${enable_v4l2}" != "no" -then - PKG_CHECK_MODULES( LIBV4L2, libv4l2, [ - VLC_ADD_LIBS([v4l2],[${LIBV4L2_LIBS}]) - VLC_ADD_CFLAGS([v4l2],[${LIBV4L2_CFLAGS}]) - AC_DEFINE(HAVE_LIBV4L2, 1, Define if libv4l2 is available)], - AC_MSG_WARN([LibV4L2 support disabled because libv4l2 development headers were not found]) - ) -fi - -dnl -dnl special access module for Hauppauge PVR cards -dnl -AC_ARG_ENABLE(pvr, - [AS_HELP_STRING([--enable-pvr], - [support PVR V4L2 cards (default disabled)])]) -if test "${enable_pvr}" = "yes" -then - VLC_ADD_PLUGIN([pvr]) -fi - dnl dnl special access module for Blackmagic SDI cards dnl @@ -2051,7 +1960,7 @@ AC_ARG_ENABLE(decklink, [disable Blackmagic DeckLink SDI input (default auto)])]) AC_ARG_WITH(decklink_sdk, [AS_HELP_STRING[--with-decklink-sdk=DIR], - [location of Blackmagic DeckLink SDI SDK])]) + [ location of Blackmagic DeckLink SDI SDK])]) if test "${enable_decklink}" != "no" then if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}" @@ -2081,14 +1990,14 @@ AC_ARG_ENABLE(vcdx, [navigate VCD with libvcdinfo (default disabled)])]) if test "${enable_vcdx}" = "yes" then - PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72], - [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], - [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])]) - PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22, - [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) - VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])], - [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])]) + PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72], + [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])], + [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])]) + PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22, + [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS]) + VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])], + [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])]) VLC_ADD_PLUGIN([vcdx]) fi @@ -2156,11 +2065,19 @@ then fi dnl -dnl libdvbpsi check for ts mux/demux +dnl Linux DVB dnl -have_dvbpsi="no" -PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"]) -AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"]) +AC_CACHE_CHECK([for Linux DVB version 5], [ac_cv_linux_s2api], [ + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([ +[#include +#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" = "yes"]) dnl dnl Screen capture module @@ -2185,19 +2102,53 @@ if test "${enable_screen}" != "no"; then fi dnl -dnl ipv6 support +dnl Real RTSP plugin dnl -have_ipv6=no -AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[ - AC_CHECK_LIB(nsl,inet_pton, [have_ipv6=yes]) -]) +AC_ARG_ENABLE(realrtsp, + [ --enable-realrtsp Real RTSP module (default disabled)]) +if test "${enable_realrtsp}" = "yes"; then + VLC_ADD_PLUGIN([access_realrtsp]) +fi -AS_IF([test "${have_ipv6}" = "yes"], [ - AC_DEFINE(HAVE_INET_PTON, 1, [Define to 1 if you have inet_pton().])]) +dnl +dnl MacOS eyeTV +AC_ARG_ENABLE(macosx-eyetv, + [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_eyetv}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") +then + VLC_ADD_LIBS([access_eyetv], [-Wl,-framework,Foundation]) + VLC_ADD_PLUGIN([access_eyetv]) +fi + +dnl +dnl QTCapture +AC_ARG_ENABLE(macosx-qtcapture, + [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)]) +if test "x${enable_macosx_qtcapture}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") +then + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore]) + VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo]) + VLC_ADD_PLUGIN([qtcapture]) +fi -AC_CHECK_FUNCS(inet_ntop,[ - AC_DEFINE(HAVE_INET_NTOP, 1, [Define to 1 if you have inet_ntop().])]) +dnl +dnl Demux plugins +dnl + +EXTEND_HELP_STRING([Mux/Demux plugins:]) + +dnl +dnl libdvbpsi check for ts mux/demux +dnl +have_dvbpsi="no" +PKG_WITH_MODULES([DVBPSI], [libdvbpsi], [have_dvbpsi="yes"]) +AM_CONDITIONAL(HAVE_DVBPSI, [test "${have_dvbpsi}" = "yes"]) dnl @@ -2221,27 +2172,32 @@ AS_IF([test "${enable_gme}" != "no"], [ dnl dnl SIDPlay plugin dnl -PKG_WITH_MODULES([SID], [libsidplay2], - AC_LANG_PUSH(C++) - oldCPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $SID_CFLAGS" - AC_CHECK_HEADER([sidplay/builders/resid.h], [ - VLC_ADD_PLUGIN([sid]) - VLC_ADD_CFLAGS([sid], [$SID_CFLAGS]) - VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder]) - ], [ - AS_IF([test "x${enable_sid}" = "xyes"], - [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)], - [AC_MSG_WARN(Library libresid-builder needed for sid was not found)] - ) - ]) - CPPFLAGS="$oldCPPFLAGS" - AC_LANG_POP(C++), - AS_IF([test "x${enable_sid}" = "xyes"], - [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)], - [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)] - ), - [C64 sid demux support], [auto]) +AC_ARG_ENABLE(sid, + [AS_HELP_STRING([--enable-sid],[C64 sid demux support (default auto)])]) +AS_IF([test "${enable_sid}" != "no"], [ + PKG_CHECK_MODULES(SID, [libsidplay2], [ + AC_LANG_PUSH(C++) + oldCPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SID_CFLAGS" + AC_CHECK_HEADER([sidplay/builders/resid.h], [ + VLC_ADD_PLUGIN([sid]) + VLC_ADD_CFLAGS([sid], [$SID_CFLAGS]) + VLC_ADD_LIBS([sid], [$SID_LIBS] [-lresid-builder]) + ], [ + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libresid-builder needed for sid was not found)], + [AC_MSG_WARN(Library libresid-builder needed for sid was not found)] + ) + ]) + CPPFLAGS="$oldCPPFLAGS" + AC_LANG_POP(C++) + ], [ + AS_IF([test "x${enable_sid}" = "xyes"], + [AC_MSG_ERROR(Library libsidplay2 needed for sid was not found)], + [AC_MSG_WARN(Library libsidplay2 needed for sid was not found)] + ) + ]) +]) dnl @@ -2250,11 +2206,8 @@ dnl PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto]) if test "${enable_sout}" != "no"; then PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg mux support], [auto]) -fi - -if test "${enable_sout}" != "no"; then dnl Check for libshout -PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto]) + PKG_ENABLE_MODULES_VLC([SHOUT], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto]) fi dnl @@ -2382,11 +2335,32 @@ then VLC_ADD_LIBS([omxil], [$LIBDL]) fi +dnl +dnl iomx codec plugin +dnl +AC_ARG_ENABLE(iomx, + [ --enable-iomx iomx codec module (default disabled)]) +if test "${enable_iomx}" = "yes" +then + CPPFLAGS_save="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} -I${srcdir}/modules/codec/omxil" # For the OMX headers + AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(media/stagefright/OMXClient.h, [ + VLC_ADD_PLUGIN([iomx]) + VLC_ADD_CXXFLAGS([iomx], [-fno-exceptions -fno-rtti]) + VLC_ADD_LIBS([iomx], [-lstagefright -lmedia -lutils -lbinder]) + ], [ + AC_MSG_ERROR("Could not find IOMX headers") + ]) + AC_LANG_POP([C++]) + CPPFLAGS="${CPPFLAGS_save}" +fi + dnl dnl CrystalHD codec plugin dnl AC_ARG_ENABLE(crystalhd, - [ --enable-crystalhd crystalhd codec plugin (default auto)]) + [ --enable-crystalhd crystalhd codec plugin (default auto)]) if test "${enable_crystalhd}" != "no"; then AC_CHECK_HEADER(libcrystalhd/libcrystalhd_if.h, [ VLC_ADD_PLUGIN([crystalhd]) @@ -2515,7 +2489,7 @@ dnl dnl libva needs avcodec dnl AC_ARG_ENABLE(libva, - [ --enable-libva libva VAAPI support (default auto)]) + [ --enable-libva VAAPI GPU decoding support (libVA) (default auto)]) AS_IF([test "${enable_libva}" != "no"], [ AS_IF([test "x${have_avcodec}" = "xyes"], [ @@ -2530,13 +2504,13 @@ AS_IF([test "${enable_libva}" != "no"], [ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.]) echo "VAAPI acceleration activated" ],[ - AS_IF([test "${enable_libva}" = "yes"], - [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])], + AS_IF([test "${enable_libva}" = "yes"], + [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])], [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])]) ]) VLC_RESTORE_FLAGS ],[ - AS_IF([test "${enable_libva}" = "yes"], + AS_IF([test "${enable_libva}" = "yes"], [AC_MSG_ERROR([Could not find required libva.])], [AC_MSG_WARN([libva not found ])]) ]) @@ -2551,24 +2525,24 @@ dnl dnl dxva2 needs avcodec dnl AC_ARG_ENABLE(dxva2, - [ --enable-dxva2 DxVA2 support (default auto)]) + [ --enable-dxva2 DxVA2 GPU decoding support (default auto)]) AS_IF([test "${enable_dxva2}" != "no"], [ if test "${SYS}" = "mingw32"; then AS_IF([test "x${have_avcodec}" = "xyes"], [ - AC_CHECK_HEADERS(dxva2api.h, + AC_CHECK_HEADERS(dxva2api.h, [ AC_CHECK_HEADERS(libavcodec/dxva2.h, [ VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid]) AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.]) echo "DxVA2 acceleration activated" ],[ - AS_IF([test "${enable_dxva2}" = "yes"], - [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])], + AS_IF([test "${enable_dxva2}" = "yes"], + [AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])], [AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])]) ]) ],[ - AS_IF([test "${enable_dxva2}" = "yes"], + AS_IF([test "${enable_dxva2}" = "yes"], [AC_MSG_ERROR([Could not find required dxva2api.h])], [AC_MSG_WARN([dxva2api.h not found])]) ]) @@ -2636,7 +2610,7 @@ dnl AC_ARG_ENABLE(swscale, AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion - (default enabled)])) + (default enabled)])) if test "${enable_swscale}" != "no" then PKG_CHECK_MODULES(SWSCALE,[libswscale], @@ -2753,20 +2727,11 @@ dnl dnl Real plugin dnl AC_ARG_ENABLE(real, - [ --enable-real Real media module (default disabled)]) + [ --enable-real Real video decoder module (default disabled)]) if test "${enable_real}" = "yes"; then VLC_ADD_PLUGIN([realvideo]) fi -dnl -dnl Real RTSP plugin -dnl -AC_ARG_ENABLE(realrtsp, - [ --enable-realrtsp Real RTSP module (default disabled)]) -if test "${enable_realrtsp}" = "yes"; then - VLC_ADD_PLUGIN([access_realrtsp]) -fi - dnl dnl A52/AC3 decoder plugin dnl @@ -2980,11 +2945,6 @@ dnl libfluidsynth (MIDI synthetizer) plugin dnl PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) -dnl -dnl libsamplerate plugin -dnl -PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) - dnl dnl Teletext Modules dnl vbi decoder plugin (using libzbvi) @@ -3045,37 +3005,13 @@ AS_IF( [test "${enable_libass}" != "no"], [ dnl dnl kate decoder plugin dnl -AC_ARG_ENABLE(kate, -[ --enable-kate kate codec (default enabled)]) -AS_IF([test "${enable_kate}" != "no"], [ - PKG_CHECK_MODULES(KATE,[kate >= 0.1.5], [ - VLC_ADD_PLUGIN([kate]) - VLC_ADD_CFLAGS([kate],[$KATE_CFLAGS]) - VLC_ADD_LIBS([kate],[$KATE_LIBS]) ],[ - AC_CHECK_HEADERS(kate/kate.h, [ - AC_CHECK_LIB(kate, kate_decode_init, [ - VLC_ADD_PLUGIN([kate]) - VLC_ADD_LIBS([kate],[-lkate -logg]) ],[ - AS_IF([test "x${enable_kate}" != "x"], [ - AC_MSG_ERROR([libkate doesn't appear to be installed on your system. - You also need to check that you have a libogg posterior to the 1.0 release.]) - ]) - ], [-lkate -logg]) - ],[ - AS_IF([test "x${enable_kate}" != "x"], [ - AC_MSG_ERROR([libkate headers do not appear to be installed on your system. - You also need to check that you have a libogg posterior to the 1.0 release.]) - ]) - ]) - ]) -]) - +PKG_ENABLE_MODULES_VLC([KATE], [], [kate >= 0.3.0], [kate codec], [auto]) dnl dnl tiger rendering for kate decoder plugin dnl AC_ARG_ENABLE(tiger, -[ --enable-tiger Tiger rendering library for Kate streams (default enabled)]) +[ --enable-tiger Tiger rendering library for Kate streams (default auto)]) AS_IF([test "${enable_tiger}" != "no"], [ PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [ AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.]) @@ -3088,7 +3024,6 @@ AS_IF([test "${enable_tiger}" != "no"], [ ]) - dnl dnl Video plugins dnl @@ -3192,7 +3127,7 @@ then if test "${SYS}" != "darwin"; then VLC_ADD_PLUGIN([vout_sdl]) fi - if test "${SYS}" != "mingw32"; then + if test "${SYS}" != "mingw32" -a "${SYS}" != "os2"; then VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11]) fi VLC_ADD_CFLAGS([vout_sdl],[${SDL_CFLAGS}]) @@ -3215,6 +3150,20 @@ then ]) fi + +dnl +dnl Mac Vout +AC_ARG_ENABLE(macosx-vout, + [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)]) +if test "x${enable_macosx_vout}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") +then + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa]) + VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL]) + VLC_ADD_PLUGIN([vout_macosx]) +fi + + dnl dnl freetype module dnl @@ -3266,10 +3215,18 @@ if test "${enable_freetype}" != "no"; then ]) fi + dnl -dnl libxml2 module +dnl QuartzText vout module (iOS/Mac OS) dnl -PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto]) +AC_ARG_ENABLE(macosx-quartztext, + [ --enable-macosx-quartztext Mac OS X quartz text module (default enabled on Mac OS X)]) +if test "x${enable_macosx_quartztext}" != "xno" && + (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes") +then + VLC_ADD_PLUGIN([quartztext]) + VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) +fi dnl dnl SVG module @@ -3301,18 +3258,6 @@ then VLC_ADD_LIBS([vout_ios], [-Wl,-framework,OpenGLES,-framework,QuartzCore,-framework,UIKit,-framework,Foundation]) fi -dnl -dnl QuartzText vout module (iOS/Mac OS) -dnl -AC_ARG_ENABLE(macosx-quartztext, - [ --enable-macosx-quartztext Mac OS X quartz text module (default enabled on Mac OS X)]) -if test "x${enable_macosx_quartztext}" != "xno" && - (test "${SYS}" = "darwin" || test "${enable_macosx_quartztext}" = "yes") -then - VLC_ADD_PLUGIN([quartztext]) - VLC_ADD_LIBS([quartztext],[-Wl,-framework,ApplicationServices]) -fi - dnl dnl Windows DirectX module dnl @@ -3324,20 +3269,24 @@ fi AC_ARG_ENABLE(directx, [ --enable-directx Win32 DirectX support (default enabled on Win32)]) -if test "${enable_directx}" != "no" -then - if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" - then - VLC_ADD_LIBS([directx],[-luser32]) +if test "${enable_directx}" != "no"; then + if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then + dnl DDraw AC_CHECK_HEADERS(ddraw.h, [ VLC_ADD_PLUGIN([directx aout_directx]) - VLC_ADD_LIBS([directx],[-lgdi32]) + VLC_ADD_LIBS([directx],[-luser32 -lgdi32]) ],[AC_MSG_ERROR([Cannot find DirectX headers!])] ) + + dnl OpenGL AC_CHECK_HEADERS(GL/glext.h, [ VLC_ADD_PLUGIN([glwin32]) VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) + ],[],[ + #include ]) + + dnl Direct3D AC_CHECK_HEADERS(d3d9.h, [ VLC_ADD_PLUGIN([direct3d]) VLC_ADD_LIBS([direct3d],[-lgdi32]) @@ -3350,20 +3299,18 @@ dnl dnl Windows Direct2D plugin dnl AC_ARG_ENABLE(direct2d, - [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ + [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)],, [ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ enable_direct2d="no" ]) ]) AS_IF([test "${enable_direct2d}" != "no"], [ - AC_LANG_PUSH([C++]) AC_CHECK_HEADERS(d2d1.h, [ VLC_ADD_PLUGIN([direct2d]) VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32]) ], [ AC_MSG_WARN([Cannot find Direct2D headers!]) ]) - AC_LANG_POP([C++]) ]) dnl @@ -3602,7 +3549,7 @@ dnl dnl AudioQueue plugin dnl AC_ARG_ENABLE(audioqueue, - [ --enable-audioqueue AudioQueue audio module (default disabled)]) + [ --enable-audioqueue AudioQueue audio module (default disabled)]) if test "${enable_audioqueue}" = "yes" then VLC_ADD_PLUGIN([audioqueue]) @@ -3628,10 +3575,9 @@ if test "${HAVE_ANDROID}" = "1"; then fi dnl -dnl UPnP Plugin (Intel SDK) +dnl libsamplerate plugin dnl -PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPnp SDK],[auto]) -VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) +PKG_ENABLE_MODULES_VLC([SAMPLERATE], [], [samplerate], [Resampler with libsamplerate], [auto]) dnl dnl Interface plugins @@ -3642,33 +3588,14 @@ EXTEND_HELP_STRING([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)])],, [ - AS_IF([test "${SYS}" != "darwin" && test "${SYS}" != "mingwce"], [ - enable_skins2="yes" - ], [ - enable_skins2="no" - ]) -]) -AS_IF([test "${enable_skins2}" = "yes"], [ - dnl freetype - AS_IF([test "${have_freetype}" != "yes"], [ - AC_MSG_ERROR([Could not find FreeType (required for skins2)]) - ]) - + [AS_HELP_STRING([--enable-skins2], [skins interface module (default auto)])]) +AS_IF([test "${enable_skins2}" != "no"], [ + have_skins_deps="yes" 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]) + VLC_ADD_LIBS([skins2],[-loleaut32 -lwinspool -lwinmm -lshell32 -ladvapi32 -lwsock32 -lgdi32 -lcomdlg32 -lole32 -luuid -lcomctl32 -lmsimg32 -luser32]) ], [test "${SYS}" = "darwin"], [ VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS]) @@ -3676,19 +3603,40 @@ AS_IF([test "${enable_skins2}" = "yes"], [ VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon]) ], [ - PKG_CHECK_MODULES([XPM], [xpm]) - PKG_CHECK_MODULES([XINERAMA], [xinerama]) - PKG_CHECK_MODULES([XEXT], [xext]) + PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"]) + PKG_CHECK_MODULES([XINERAMA], [xinerama],, [have_skins_deps="no"]) + PKG_CHECK_MODULES([XEXT], [xext],, [have_skins_deps="no"]) 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} ${XINERAMA_LIBS} -lX11]) ]) - VLC_ADD_PLUGIN([skins2]) - ALIASES="${ALIASES} svlc" + AS_IF([test "${have_freetype}" != "yes"], [ + have_skins_deps="no" + ]) + + AS_IF([test "${have_skins_deps}" = "no"], [ + AS_IF([test "x${enable_skins2}" = "x"], [ + AC_MSG_WARN([Skins2 interface disabled due to missing dependencies.]) + ], [ + AC_MSG_ERROR([Skins2 interface requires FreeType, libxpm, libxext and libxinerama]) + ]) + enable_skins2="no" + ], [ + VLC_ADD_PLUGIN([skins2]) + ALIASES="${ALIASES} svlc" + ]) ]) AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) +AC_ARG_ENABLE(libtar, + [ --enable-libtar libtar support for skins2 (default auto)]) +AS_IF([test "${enable_skins2}" = "yes" && test "${enable_libtar}" != "no"], [ + AC_CHECK_HEADERS(libtar.h, [ + VLC_ADD_LIBS([skins2],[-ltar]) + ]) +]) + dnl dnl Hildon UI dnl @@ -3723,7 +3671,7 @@ AC_ARG_ENABLE(qt4, AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no]) ]) AS_IF([test "${enable_qt4}" != "no"], [ - PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [ + PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.6.0], [ VLC_ADD_PLUGIN([qt4]) VLC_ADD_LIBS([qt4],[${QT4_LIBS}]) VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}]) @@ -3778,7 +3726,7 @@ AS_IF([test "${enable_skins2}" != "no" && test "x$enable_qt4" = "xno"], [ ]) dnl -dnl MacOS X video output/gui modules +dnl MacOS X gui module dnl AC_ARG_ENABLE(macosx, [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)]) @@ -3805,19 +3753,8 @@ then fi dnl -dnl MacOS X related modules +dnl MacOS X dialor provider dnl - -AC_ARG_ENABLE(macosx-vout, - [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)]) -if test "x${enable_macosx_vout}" != "xno" && - (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes") -then - VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,Cocoa]) - VLC_ADD_LIBS([vout_macosx],[-Wl,-framework,OpenGL]) - VLC_ADD_PLUGIN([vout_macosx]) -fi - AC_ARG_ENABLE(macosx-dialog-provider, [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)]) if test "x${enable_macosx_dialog_provider}" != "xno" && @@ -3827,33 +3764,6 @@ then VLC_ADD_PLUGIN([macosx_dialog_provider]) fi -AC_ARG_ENABLE(macosx-qtcapture, - [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)]) -if test "x${enable_macosx_qtcapture}" != "xno" && - (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes") -then - VLC_ADD_LIBS([qtcapture], [-Wl,-framework,Cocoa]) - VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QTKit]) - VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreAudio]) - VLC_ADD_LIBS([qtcapture], [-Wl,-framework,QuartzCore]) - VLC_ADD_LIBS([qtcapture], [-Wl,-framework,CoreVideo]) - VLC_ADD_PLUGIN([qtcapture]) -fi - -AC_ARG_ENABLE(macosx-eyetv, - [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)]) -if test "x${enable_macosx_eyetv}" != "xno" && - (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes") -then - VLC_ADD_LIBS([access_eyetv], [-Wl,-framework,Foundation]) - VLC_ADD_PLUGIN([access_eyetv]) -fi - -AC_ARG_ENABLE(macosx-vlc-app, - [ --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)]) -AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && - (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) - dnl dnl ncurses module dnl @@ -3911,6 +3821,22 @@ then ]) fi +dnl +dnl Lirc plugin +dnl +AC_ARG_ENABLE(lirc, + [ --enable-lirc lirc support (default disabled)]) +if test "${enable_lirc}" = "yes" +then + AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") + if test "${have_lirc}" = "true" + then + VLC_ADD_PLUGIN([lirc]) + VLC_ADD_LIBS([lirc],[-llirc_client]) + fi +fi + +EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) dnl dnl Visualisation plugin dnl @@ -3930,7 +3856,7 @@ dnl dnl libprojectM visualization plugin dnl AC_ARG_ENABLE(projectm, - [ --enable-projectm projectM visualization plugin (default enabled)]) + [ --enable-projectm projectM visualization plugin (default enabled)]) AS_IF([test "${enable_projectm}" != "no"], [ PKG_CHECK_MODULES(PROJECTM, libprojectM, @@ -3961,6 +3887,7 @@ AS_IF([test "${enable_atmo}" != no], [ ]) ]) +EXTEND_HELP_STRING([Service Discovery plugins:]) dnl dnl Bonjour services discovery PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) @@ -3974,22 +3901,19 @@ dnl MTP devices services discovery PKG_ENABLE_MODULES_VLC([MTP], [mtp access_mtp], [libmtp >= 1.0.0], [MTP devices support], [auto]) dnl -dnl Lirc plugin +dnl UPnP Plugin (Intel SDK) dnl -AC_ARG_ENABLE(lirc, - [ --enable-lirc lirc support (default disabled)]) -if test "${enable_lirc}" = "yes" -then - AC_CHECK_HEADER(lirc/lirc_client.h, AC_CHECK_LIB(lirc_client, lirc_init, have_lirc="true", have_lirc="false"),have_lirc="false") - if test "${have_lirc}" = "true" - then - VLC_ADD_PLUGIN([lirc]) - VLC_ADD_LIBS([lirc],[-llirc_client]) - fi -fi +PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto]) +VLC_ADD_CXXFLAGS([upnp],[${UPNP_CFLAGS}]) EXTEND_HELP_STRING([Misc options:]) +dnl +dnl libxml2 module +dnl +PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto]) + + dnl dnl libgcrypt dnl @@ -4083,15 +4007,32 @@ AS_IF([test "${have_libgcrypt}" = "yes"], [ dnl -dnl OSSO (Maemo screen blanking) plugin +dnl Nokia MCE plugin (Maemo screen unblanking) dnl -PKG_ENABLE_MODULES_VLC([OSSO_SCREENSAVER], [], [libosso], [Maemo support], [auto]) +PKG_CHECK_MODULES([MCE], [dbus-1 mce], [VLC_ADD_PLUGIN([mce])], [true]) + AS_IF([test -f "/etc/maemo_version"], [ AC_DEFINE([HAVE_MAEMO], 1, [Define to 1 if building for the Maemo platform.]) ]) +dnl +dnl Taglib plugin +dnl +AC_ARG_ENABLE(taglib, + [AS_HELP_STRING([--disable-taglib], + [do not use TagLib (default enabled)])]) +AS_IF([test "${enable_taglib}" != "no"], [ + PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, [ + VLC_ADD_PLUGIN([taglib]) + VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) + VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) + ], [ + AC_MSG_WARN(TagLib library not found)]) +]) + + dnl dnl update checking system dnl @@ -4109,52 +4050,53 @@ then fi dnl -dnl SQLite +dnl Growl notification plugin dnl -AC_ARG_WITH(sqlite, - [ --with-sqlite=PATH sqlite path linking]) -if test "${SYS}" != "darwin"; then - PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto]) -else - if test "${enable_sqlite}" != "no" - then - AC_CHECK_HEADERS(sqlite3.h, [ - VLC_ADD_PLUGIN([sqlite]) - if test "${with_sqlite}" != "no" -a -n "${with_sqlite}"; then - AC_MSG_CHECKING(existence of sqlite directory in ${with_sqlite}) - real_sqlite="`cd ${with_sqlite} 2>/dev/null && pwd`" - if test -z "${real_sqlite}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_sqlite}]) - fi - VLC_ADD_CFLAGS([sqlite],[-I${with_sqlite}/include]) - VLC_ADD_LIBS([sqlite], [-L${with_sqlite}/lib -lsqlite3]) - AC_MSG_RESULT(yes) - else - VLC_ADD_LIBS([sqlite], [-lsqlite3]) - fi - AC_DEFINE([SQLITE_MODULE], 1, [Define if you want to use SQLite module]) ], - AC_MSG_ERROR([sqlite3 is required for sqlite module]) ) - fi -fi -AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"]) +AC_ARG_ENABLE(growl, + [ --enable-growl growl notification plugin (default disabled)],, + [enable_growl=no]) +AS_IF([test "${enable_growl}" != "no"], [ + AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl/Growl.framework/Versions/A/Headers/GrowlDefines.h, [ + VLC_ADD_PLUGIN([growl]) + VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR}/Growl -Wl,-framework,Growl,-framework,CoreFoundation]) + VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}/Growl]) + VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] ) + ]) + ] +) + +dnl +dnl Libnotify notification plugin +dnl +PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto]) dnl dnl media library dnl -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 - 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") - VLC_ADD_PLUGIN([media_library]) - fi -fi -AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"]) +AC_ARG_ENABLE(media-library, + [ --enable-media-library media library (default disabled)]) +AS_IF([test "${enable_media_library}" = "yes"], [ + AC_DEFINE([MEDIA_LIBRARY], 1, [Define if you want to use the VLC media library]) + VLC_ADD_CPPFLAGS([qt4],"-DMEDIA_LIBRARY") + VLC_ADD_PLUGIN([media_library]) + +dnl +dnl SQLite +dnl + AS_IF([test "${SYS}" != "darwin"], [ + PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto]) + ], [ + AS_IF([test "${enable_sqlite}" != "no"], [ + AC_CHECK_HEADERS(sqlite3.h, [ + VLC_ADD_PLUGIN([sqlite]) + VLC_ADD_LIBS([sqlite], [-lsqlite3]) + ], [ + AC_MSG_ERROR([sqlite3 is required for the media library]) + ]) + ]) + ]) +]) + dnl dnl Endianness check @@ -4202,12 +4144,12 @@ dnl loader=false AC_ARG_ENABLE(loader, AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms - (default disabled)])) + (default disabled)])) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], [ VLC_ADD_PLUGIN([dmo]) - VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/libs/loader]) - VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la]) + VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/modules/codec/loader]) + VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/modules/codec/loader/libloader.la]) VLC_ADD_CPPFLAGS([realvideo], [-DLOADER]) VLC_ADD_LIBS([dmo quicktime], [-lpthread]) ]) @@ -4221,23 +4163,11 @@ AC_ARG_ENABLE(vlc, [ --enable-vlc build the VLC media player (default enabled)]) AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"]) +AC_ARG_ENABLE(macosx-vlc-app, + [ --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)]) +AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" && + (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ]) -dnl -dnl Plugin and builtin checks -dnl -plugin_support=yes - -dnl Automagically disable plugins if there is no system support for -dnl dynamically loadable files (.so, .dll, .dylib). -dnl don't forget vlc-win32 still can load .dll as plugins -AS_IF([test "${ac_cv_have_plugins}" = "no"], [ - AC_MSG_WARN([*** No plugin support! Building statically! ***]) - plugin_support=no -]) - -AS_IF([test "${plugin_support}" != "no"], [ - AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported]) -]) dnl dnl Pic and shared libvlc stuff @@ -4307,9 +4237,6 @@ AC_SUBST(FILE_LIBVLC_DLL) AC_CONFIG_FILES([ Makefile doc/Makefile - libs/loader/Makefile - libs/srtp/Makefile - libs/unzip/Makefile modules/Makefile m4/Makefile po/Makefile.in @@ -4317,6 +4244,7 @@ AC_CONFIG_FILES([ compat/Makefile src/Makefile src/test/Makefile + lib/Makefile bin/Makefile test/Makefile modules/access/Makefile @@ -4329,6 +4257,7 @@ AC_CONFIG_FILES([ modules/access/vcdx/Makefile modules/access/screen/Makefile modules/access/zip/Makefile + modules/access/zip/unzip/Makefile modules/access_output/Makefile modules/audio_filter/Makefile modules/audio_mixer/Makefile @@ -4336,6 +4265,7 @@ AC_CONFIG_FILES([ modules/codec/Makefile modules/codec/avcodec/Makefile modules/codec/dmo/Makefile + modules/codec/loader/Makefile modules/codec/omxil/Makefile modules/codec/shine/Makefile modules/codec/spudec/Makefile