X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=1e80f47321de30ff82aff07472c594ad6127d27d;hb=5b00444d88face2cc16bccd266afa8e9c29b1666;hp=8603f46c58f8a63541261acac075fda34627f80a;hpb=c5c06b64c806052086e5772d64e540a8db7e4a9b;p=vlc diff --git a/configure.ac b/configure.ac index 8603f46c58..1e80f47321 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ PKGDIR="vlc" AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" -CODENAME="Goldeneye" +CODENAME="Yellow Bastard" COPYRIGHT_YEARS="1996-2009" AC_PREREQ(2.59c) @@ -25,6 +25,10 @@ AC_CANONICAL_HOST AM_INIT_AUTOMAKE(tar-ustar) AM_CONFIG_HEADER(config.h) +# Disable with "./configure --disable-silent-rules" or "make V=1" +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + dnl Too many people are not aware of maintainer mode: dnl If you want to use it, you definitely know what you are doing, so dnl you can specify "--disable-maintainer-mode". But if you want the default @@ -284,20 +288,6 @@ case "${host_os}" in OBJC="${OBJC} -isysroot ${with_macosx_sdk}" LD="${LD} -syslibroot ${with_macosx_sdk}" fi - if test "${host_cpu}" = "powerpc"; then - CPP="${CPP} -arch ppc" - CC="${CC} -arch ppc" - CXX="${CXX} -arch ppc" - OBJC="${OBJC} -arch ppc" - LD="${LD} -arch ppc" - fi - if test "${host_cpu}" = "i386"; then - CPP="${CPP} -arch i386" - CC="${CC} -arch i386" - CXX="${CXX} -arch i386" - OBJC="${OBJC} -arch i386" - LD="${LD} -arch i386" - fi AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) if test "${with_macosx_version_min}" != "" ; then @@ -335,12 +325,12 @@ case "${host_os}" in fi fi ;; - *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) + *mingw32* | *cygwin* | *wince* | *mingwce*) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) case "${host_os}" in - *wince* | *mingwce* | *mingw32ce* | *pe*) + *wince* | *mingwce* | *mingw32ce*) SYS=mingwce dnl Sadly CeGCC still needs non-wince macros AC_DEFINE([_WIN32_WINNT], 0x0501, [Define to '0x0500' for Windows 2000 APIs.]) @@ -367,23 +357,20 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-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 slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd],[-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 slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi],[-lws2_32]) + VLC_ADD_LIBS([access_file], [-lshlwapi]) 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 sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd],[-lws2]) + VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts],[-lws2]) VLC_ADD_LIBS([libvlccore],[-lmmtimer]) fi ;; *nto*) SYS=nto - VLC_ADD_LIBS([x11 xvideo],[-lsocket]) ;; solaris*) SYS=solaris - # _POSIX_PTHREAD_SEMANTICS is needed to get the POSIX ctime_r - # Perhaps it is useful other places as well? - CFLAGS_save="${CFLAGS_save} -D_POSIX_PTHREAD_SEMANTICS"; CFLAGS="${CFLAGS_save}" ;; hpux*) SYS=hpux @@ -543,6 +530,7 @@ fi dnl dnl Buggy glibc prevention. Purposedly not cached. +dnl See sourceware.org bugs 5058 and 5443. dnl Ubuntu alone has 20 bug numbers for this... dnl AC_MSG_CHECKING(for buggy GNU/libc versions) @@ -586,8 +574,8 @@ AC_CHECK_FUNCS(fdatasync,, [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) ]) -dnl Check for Linux system calls -AC_CHECK_FUNCS([vmsplice]) +dnl Check for non-standard system calls +AC_CHECK_FUNCS([vmsplice fstatfs]) AH_BOTTOM([#include ]) @@ -609,12 +597,14 @@ if test ${ac_cv_langinfo_codeset} = yes; then [Define if you have and nl_langinfo(CODESET).]) fi +SOCKET_LIBS="" AC_CHECK_FUNCS(connect,,[ AC_CHECK_LIB(socket,connect,[ VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket) - LIBS_socket="-lsocket" + SOCKET_LIBS="-lsocket" ]) ]) +AC_SUBST(SOCKET_LIBS) AC_CHECK_FUNCS(send,,[ AC_CHECK_LIB(socket,send,[ @@ -665,7 +655,7 @@ dnl -lnsl and -lsocket are needed on Solaris; dnl we purposedly make the test fail on Windows LIBS_save="${LIBS}" AH_TEMPLATE(HAVE_GETADDRINFO, [Define to 1 if you have the `getaddrinfo' function.]) -AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${LIBS_socket}]) +AC_SEARCH_LIBS([getaddrinfo], [nsl], [AC_DEFINE(HAVE_GETADDRINFO)],, [${SOCKET_LIBS}]) dnl NOTE: we assume getaddrinfo will be present if getnameinfo or gai_strerro dnl are @@ -732,7 +722,7 @@ AC_CHECK_LIB(m,cos,[ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene],[-lm]) ]) AC_CHECK_LIB(m,pow,[ - VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer spatializer param_eq libvlccore vorbis freetype mod mpc dmo quicktime realaudio realvideo galaktos opengl],[-lm]) + VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm]) ]) AC_CHECK_LIB(m,sqrt,[ VLC_ADD_LIBS([headphone_channel_mixer normvol speex mono colorthres extract],[-lm]) @@ -754,12 +744,6 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for dynamic plugins ac_cv_have_plugins=no -# OS X style -AC_CHECK_HEADERS(mach-o/dyld.h, - [AC_CHECK_FUNCS(NSLinkModule, - [AC_DEFINE(HAVE_DL_DYLD, 1, [Define if you have the Darwin dyld API]) - ac_cv_have_plugins=yes])]) - # HP-UX style if test "${ac_cv_have_plugins}" = "no"; then AC_CHECK_HEADERS(dl.h) @@ -775,14 +759,6 @@ if test "${ac_cv_have_plugins}" = "no"; then fi fi -# Whatever style -if test "${ac_cv_have_plugins}" = "no"; then - AC_CHECK_LIB(dld, dld_link, - [VLC_ADD_LIBS([libvlccore],[-ldld]) - AC_DEFINE(HAVE_DL_DLD_LINK, 1, [Define if you have the GNU dld library]) - ac_cv_have_plugins=yes]) -fi - # Win32 style if test "${ac_cv_have_plugins}" = "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then @@ -810,7 +786,7 @@ if test "${ac_cv_have_plugins}" = "no"; then fi # Only test for dlopen() if the others didn't work -if test "${ac_cv_have_plugins}" = "no"; then +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, @@ -876,8 +852,8 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ AC_MSG_RESULT(no)]) dnl Check for headers -AC_CHECK_HEADERS(getopt.h strings.h locale.h) -AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h) +AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h) +AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h) AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ @@ -886,7 +862,7 @@ AC_CHECK_HEADERS([net/if.h], [], [], ]) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) -AC_CHECK_HEADERS([linux/version.h linux/dccp.h]) +AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h]) AC_CHECK_HEADERS(syslog.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" @@ -971,38 +947,6 @@ fi AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) -dnl Check for hal -AC_ARG_ENABLE(hal, - [ --enable-hal Linux HAL services discovery (default enabled)]) - -if test "${enable_hal}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -then - PKG_CHECK_MODULES(HAL, hal >= 0.5.0, - [ - AC_DEFINE( HAVE_HAL, 1, [Define if you have the HAL library] ) - VLC_ADD_PLUGIN([hal]) - VLC_ADD_PLUGIN([probe_hal]) - VLC_ADD_LIBS([libvlccore hal probe_hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([libvlccore hal probe_hal],[$HAL_CFLAGS])], - [AC_MSG_WARN([libhal >= 0.5.0 was not found. Install libhal-dev ?])] - ) -fi - -dnl Check for mtp -AC_ARG_ENABLE(mtp, - [ --enable-mtp MTP devices support (default enabled)]) - -if test "${enable_mtp}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -then - PKG_CHECK_MODULES(MTP, libmtp >= 0.3.0, - [ VLC_ADD_PLUGIN([mtp]) - VLC_ADD_PLUGIN([access_mtp]) - VLC_ADD_LIBS([mtp access_mtp],[$MTP_LIBS]) - VLC_ADD_CFLAGS([mtp access_mtp],[$MTP_CFLAGS])], - [AC_MSG_WARN(MTP library not found)] - ) -fi - dnl Check for dbus AC_ARG_ENABLE(dbus, [ --enable-dbus Linux D-BUS message bus system (default enabled)]) @@ -1229,6 +1173,7 @@ dnl Video filters: VLC_ADD_PLUGIN([deinterlace]) VLC_ADD_PLUGIN([yuvp]) VLC_ADD_PLUGIN([invert]) +VLC_ADD_PLUGIN([mirror]) VLC_ADD_PLUGIN([adjust]) VLC_ADD_PLUGIN([transform]) VLC_ADD_PLUGIN([wave]) @@ -1622,7 +1567,7 @@ if test -n "${with_tuning}"; then fi else if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then - CFLAGS_TUNING="-march=pentium-m -mtune=prescott" + CFLAGS_TUNING="-march=prescott -mtune=generic" elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" elif test "${host_cpu}" = "x86_64"; then @@ -1727,21 +1672,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) -AC_ARG_ENABLE(switcher, - [ --enable-switcher Stream-out switcher plugin (default disabled)]) - -dnl Check for libshout -AC_ARG_ENABLE(shout, - [ --enable-shout libshout output plugin (default disabled)]) -if test "${enable_shout}" = "yes"; then - PKG_CHECK_MODULES(SHOUT, shout >= 2.1, - [AC_DEFINE(HAVE_SHOUT, 1, [Define if you have the libshout library]) - VLC_ADD_PLUGIN([access_output_shout]) - VLC_ADD_LIBS([access_output_shout],[$SHOUT_LIBS]) - VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])], - [AC_MSG_WARN(libshout library not found)]) -fi - dnl Lua modules AC_ARG_ENABLE(lua, AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface @@ -1795,19 +1725,8 @@ AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) dnl dnl libproxy support dnl -AC_ARG_ENABLE(libproxy, - [ --enable-libproxy libproxy support (default auto)]) -AS_IF([test "${enable_libproxy}" != "no"], [ - PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [ - AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available]) - VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS]) - VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS]) - ], [ - AS_IF([test "x${enable_libproxy}" != "x"], [ - AC_MSG_ERROR([libproxy could not be found on your system]) - ]) - ]) -]) +PKG_ENABLE_MODULES_VLC([LIBPROXY], [], [libproxy-1.0], [libproxy support], [auto]) + dnl dnl VideoLAN manager @@ -1842,20 +1761,7 @@ AS_IF([test "${enable_growl}" != "no"], [ dnl dnl Libnotify notification plugin dnl - -AC_ARG_ENABLE(notify, - [ --enable-notify libnotify notification plugin (default enabled)]) -AS_IF([test "${enable_notify}" != "no" -a "${SYS}" != "mingw32"], [ - PKG_CHECK_MODULES(NOTIFY, libnotify, - [ - VLC_ADD_PLUGIN([notify]) - VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS]) - VLC_ADD_LIBS(notify, [$NOTIFY_LIBS]) - ],[ - AS_IF([test "${enable_notify}" = "yes"],[ - AC_MSG_WARN( libnotify not found) ]) - ]) - ]) +PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto]) dnl dnl Audioscrobbler plugin @@ -1881,7 +1787,6 @@ AC_ARG_ENABLE(taglib, [AC_MSG_WARN(TagLib library not found)]) ]) - dnl dnl Input plugins dnl @@ -2020,66 +1925,11 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.]) fi dnl -dnl special access module for dc1394 input -dnl -AC_ARG_ENABLE(dc1394, - [ --enable-dc1394 dc1394 access module (default disabled)]) -if test "${enable_dc1394}" = "yes" -then - dnl - dnl Check for libraw1394 - dnl - PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, - [ - VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libraw1394`]) - VLC_ADD_CPPFLAGS([dc1394],[`${PKG_CONFIG} --cflags libraw1394`]) - ], - [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] - ) - - dnl - dnl Check for libdc1394 - dnl - PKG_CHECK_MODULES(LIBDC1394, libdc1394-2 >= 2.0.2, - [ - VLC_ADD_PLUGIN([dc1394]) - VLC_ADD_LIBS([dc1394],[`${PKG_CONFIG} --libs libdc1394-2`]) - VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libdc1394-2`]) - ], - [AC_MSG_ERROR([Couldn't find libdc1394 >= 2.0.2, install libdc1394 development package])] - ) -fi - -dnl -dnl dv module: digital video module check for libraw1394 +dnl - special access module for dc1394 input +dnl - dv module: digital video module check for libraw1394 dnl -AC_ARG_ENABLE(dv, -[ --enable-dv dv input module (default disabled)]) -if test "${enable_dv}" = "yes" -then - dnl - dnl Check for libraw1394 - dnl - PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 2.0.1, - [ - VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libraw1394`]) - VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libraw1394`]) - ], - [AC_MSG_ERROR([Couldn't find libraw1394 >= 2.0.1, install libraw1394 development package])] - ) - - dnl - dnl Check for libavc1394 - dnl - PKG_CHECK_MODULES(LIBAVC1394, libavc1394 >= 0.5.3, - [ - VLC_ADD_PLUGIN([access_dv]) - VLC_ADD_LIBS([access_dv],[`${PKG_CONFIG} --libs libavc1394`]) - VLC_ADD_CPPFLAGS([access_dv],[`${PKG_CONFIG} --cflags libavc1394`]) - ], - [AC_MSG_ERROR([Couldn't find libavc1394 >= 0.5.1, install libavc1394 development package])] - ) -fi +PKG_ENABLE_MODULES_VLC([dc1394], [], [libraw1394 >= 2.0.1 libdc1394 >= 1.0.0], [dc1394 access module], [auto]) +PKG_ENABLE_MODULES_VLC([dv], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto]) dnl dnl dvdread module: check for libdvdread @@ -2276,9 +2126,6 @@ if test "${enable_smb}" != "no"; then [ if test -n "${enable_smb}"; then AC_MSG_ERROR([cannot find libsmbclient headers]) fi ]) - AC_CHECK_MEMBER([struct _SMBCCTX.close_fn], - AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], 1, [Define if samba has _SMBCCTX.close_fn]),, - [#include ]) fi dnl @@ -2471,17 +2318,8 @@ fi dnl dnl gnomeVFS access module dnl -AC_ARG_ENABLE(gnomevfs, - [ --enable-gnomevfs GnomeVFS access module (default disabled)]) -if test "${enable_gnomevfs}" = "yes" -then - PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, - VLC_ADD_LIBS([access_gnomevfs],[$GNOMEVFS_LIBS]) - VLC_ADD_CPPFLAGS([access_gnomevfs],[$GNOMEVFS_CPPFLAGS]) - VLC_ADD_CFLAGS([access_gnomevfs],[$GNOMEVFS_CFLAGS]) - VLC_ADD_PLUGIN([access_gnomevfs]), - AC_MSG_WARN([GnomeVFS support disabled because GnomeVFS development headers not found])) -fi +PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto]) + dnl Need to test libcdio and libvcdinfo for a number of things. Do it now. AC_ARG_ENABLE(libcdio, @@ -2717,47 +2555,14 @@ AC_CHECK_FUNCS(inet_ntop,[ dnl dnl ogg demux plugin dnl -AC_ARG_ENABLE(ogg, - [ --enable-ogg Ogg demux support (default enabled)]) -if test "${enable_ogg}" != "no" -then - AC_ARG_WITH(ogg-tree, - [ --with-ogg-tree=PATH ogg tree for static linking]) - if test -n "${with_ogg_tree}" - then - AC_MSG_CHECKING(for libogg.a in ${with_ogg_tree}) - real_ogg_tree="`cd ${with_ogg_tree} 2>/dev/null && pwd`" - if test -z "${real_ogg_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_ogg_tree}]) - fi - if test -f "${real_ogg_tree}/src/.libs/libogg.a" - then - dnl Use a custom ogg - AC_MSG_RESULT(${real_ogg_tree}/src/.libs/libogg.a) - VLC_ADD_PLUGIN([ogg]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ogg]) - fi - VLC_ADD_LIBS([ogg mux_ogg speex vorbis],[${real_ogg_tree}/src/.libs/libogg.a]) - VLC_ADD_CFLAGS([ogg mux_ogg speex vorbis],[-I${real_ogg_tree}/include]) - else - dnl The given ogg wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_ogg_tree}/src/.libs/libogg.a, make sure you compiled ogg in ${with_ogg_tree}]) - fi - else - AC_CHECK_HEADERS(ogg/ogg.h, [ - AC_CHECK_LIB( ogg, oggpack_read, [ - VLC_ADD_PLUGIN([ogg]) - if test "${enable_sout}" != "no"; then - VLC_ADD_PLUGIN([mux_ogg]) - fi - VLC_ADD_LIBS([ogg mux_ogg],[-logg])]) - ],[]) - fi +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 demux 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]) fi dnl @@ -2860,9 +2665,12 @@ AC_ARG_ENABLE(mpc, [ --enable-mpc Mpc demux support (default enabled)]) if test "${enable_mpc}" != "no" then - AC_CHECK_HEADERS(mpcdec/mpcdec.h, [ + AC_CHECK_HEADERS([mpc/mpcdec.h], [ VLC_ADD_PLUGIN([mpc]) - VLC_ADD_LIBS([mpc],[-lmpcdec])]) + VLC_ADD_LIBS([mpc],[-lmpcdec])], + [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [ + VLC_ADD_PLUGIN([mpc]) + VLC_ADD_LIBS([mpc],[-lmpcdec])])]) fi dnl @@ -3014,7 +2822,7 @@ AC_ARG_ENABLE(avcodec, [ --enable-avcodec libavcodec codec (default enabled)]) if test "${enable_avcodec}" != "no" then - PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil], + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 51.48.0 libavutil], [ VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" @@ -3025,11 +2833,27 @@ then VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS]) VLC_ADD_CFLAGS([avcodec],[$AVCODEC_CFLAGS]) VLC_RESTORE_FLAGS + have_avcodec="yes" ],[ AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.]) ]) fi +dnl +dnl stream_out switcher needs libavcodec +dnl +AC_ARG_ENABLE(switcher, + [ --enable-switcher Stream-out switcher plugin (default disabled)]) +AS_IF([test "${enable_switcher}" = "yes"], [ + AS_IF([test "x${have_avcodec}" = "xyes"], [ + VLC_ADD_PLUGIN([stream_out_switcher]) + VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS]) + VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS]) + ],[AC_MSG_ERROR([Stream_out switcher depends on avcodec]) + ]) +]) + + dnl dnl avformat demuxer/muxer plugin dnl @@ -3152,48 +2976,7 @@ fi dnl dnl twolame encoder plugin dnl -AC_ARG_ENABLE(twolame, -[ --enable-twolame twolame codec (default disabled)]) -if test "${enable_twolame}" = "yes" -then - AC_ARG_WITH(twolame-tree, - [ --with-twolame-tree=PATH twolame tree for static linking]) - if test -n "${with_twolame_tree}" - then - AC_MSG_CHECKING(for libtwolame.a in ${with_twolame_tree}) - real_twolame_tree="`cd ${with_twolame_tree} 2>/dev/null && pwd`" - if test -z "${real_twolame_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_twolame_tree}]) - fi - if test -f "${real_twolame_tree}/libtwolame/.libs/libtwolame.a" - then - dnl Use a custom twolame - AC_MSG_RESULT(${real_twolame_tree}/libtwolame/.libs/libtwolame.a) - VLC_ADD_PLUGIN([twolame]) - VLC_ADD_LIBS([twolame],[${real_twolame_tree}/libtwolame/.libs/libtwolame.a]) - VLC_ADD_CPPFLAGS([twolame],[-I${real_twolame_tree}/libtwolame -DLIBTWOLAME_STATIC]) - else - dnl The given libtwolame wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_twolame_tree}/libtwolame/.libs/libtwolame.a, make sure you compiled libtwolame in ${with_twolame_tree}]) - fi - else - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC" - LDFLAGS="${LDFLAGS_save} ${LIBS_twolame}" - AC_CHECK_HEADERS(twolame.h, , - [ AC_MSG_ERROR([Cannot find development header for libtwolame...]) ]) - AC_CHECK_LIB(twolame, twolame_init, [ - VLC_ADD_PLUGIN([twolame]) - VLC_ADD_CPPFLAGS([twolame],[-DLIBTWOLAME_STATIC]) - VLC_ADD_LIBS([twolame],[-ltwolame]) ], - [ AC_MSG_ERROR([Cannot find libtwolame library...]) ]) - LDFLAGS="${LDFLAGS_save}" - CPPFLAGS="${CPPFLAGS_save}" - fi -fi +PKG_ENABLE_MODULES_VLC([twolame], [], [twolame], [MPEG Audio Layer 2 encoder], [auto], [], [], [ -DLIBTWOLAME_STATIC]) dnl dnl QuickTime plugin @@ -3334,169 +3117,22 @@ dnl AS_IF([test "x${enable_dts}" != "x"], [ AC_MSG_ERROR([--enable-dts is obsolete. Please use libdca and --enable-dca.]) ]) -AS_IF([test "x${with_dts_tree}" != "x"], [ - AC_MSG_ERROR([--with-dts-tree is obsolete. Please use libdca and --with-dca-tree.]) -]) - -AC_ARG_ENABLE(dca, - AS_HELP_STRING([--enable-dca],[DTS Coherent Acoustics support with libdca - (default enabled)])) -AS_IF([test "${enable_dca}" != "no"], [ - AC_ARG_WITH(dca-tree, - [ --with-dca-tree=PATH libdca tree for static linking],, - [with_dca_tree="no"]) - AS_IF([test "${with_dca_tree}" != "no"], [ - real_dca_tree="`cd ${with_dca_tree} 2>/dev/null && pwd`" - AS_IF([test -z "${real_dca_tree}"], [ - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([${with_dca_tree} directory doesn't exist]) - ]) - dnl Use a custom libdca - AC_MSG_CHECKING(for libdca in ${real_dca_tree}) - AS_IF([test -f "${real_dca_tree}/libdca/.libs/libdca.a"], [ - AC_MSG_RESULT(yes) - VLC_ADD_LIBS([dtstofloat32],[${real_dca_tree}/libdca/.libs/libdca.a]) - AS_IF([test -f "${real_dca_tree}/include/dca.h"], [ - VLC_ADD_CPPFLAGS([dtstofloat32],[-I${real_dca_tree}/include]) - ], [ - VLC_ADD_CPPFLAGS([dtstofloat32],[-I${real_dca_tree}/../include]) - ]) - ], [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([the specified tree doesn't have libdca/.libs/libdca.a]) - ]) - ], [ - PKG_CHECK_MODULES([DCA], [libdca >= 0.0.5], [ - VLC_ADD_PLUGIN([dtstofloat32]) - VLC_ADD_CPPFLAGS([dtstofloat32], [${DCA_CFLAGS}]) - VLC_ADD_LIBS([dtstofloat32], [${DCA_LIBS}]) - ], [ - AS_IF([test "x${enable_dca}" != "x"], [ - AC_MSG_ERROR([${DCA_PKG_ERRORS}]) - ]) - ]) - ]) -]) +PKG_ENABLE_MODULES_VLC([DCA], [dtstofloat32], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto]) dnl dnl Flac plugin dnl -AC_ARG_ENABLE(flac, - [ --enable-flac libflac decoder/encoder support (default disabled)]) -if test "${enable_flac}" = "yes" -then - AC_ARG_WITH(flac-tree, - [ --with-flac-tree=PATH flac tree for static linking]) - if test -n "${with_flac_tree}" - then - AC_MSG_CHECKING(for libFLAC.a in ${with_flac_tree}) - real_flac_tree="`cd ${with_flac_tree} 2>/dev/null && pwd`" - if test -z "${real_flac_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_flac_tree}]) - fi - if test -f "${real_flac_tree}/src/libFLAC/.libs/libFLAC.a" - then - dnl Use a custom flac - AC_MSG_RESULT(${real_flac_tree}/src/libFLAC/.libs/libFLAC.a) - VLC_ADD_LIBS([flac],[${real_flac_tree}/src/libFLAC/.libs/libFLAC.a]) - VLC_ADD_CFLAGS([flac],[-I${real_flac_tree}/include]) - AC_DEFINE(HAVE_FLAC_STREAM_DECODER_H, 1, [Define if you have FLAC]) - else - dnl The given flac wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_flac_tree}/src/libFLAC/.libs/libFLAC.a, make sure you compiled flac in ${with_flac_tree}]) - fi - else - AC_CHECK_HEADERS(FLAC/stream_decoder.h, [ - VLC_ADD_LIBS([flac],[-lFLAC -logg]) - ],[]) - fi -fi +PKG_ENABLE_MODULES_VLC([FLAC], [], [flac], [libflac decoder/encoder support], [auto]) dnl dnl Libmpeg2 plugin dnl -AC_ARG_ENABLE(libmpeg2, - [ --enable-libmpeg2 libmpeg2 decoder support (default enabled)]) -if test "${enable_libmpeg2}" != "no" -then - AC_ARG_WITH(libmpeg2-tree, - [ --with-libmpeg2-tree=PATH libmpeg2 tree for static linking]) - AS_IF([test -n "${with_libmpeg2_tree}"],[ - AC_MSG_CHECKING(for libmpeg2.a in ${with_libmpeg2_tree}) - real_libmpeg2_tree="`cd ${with_libmpeg2_tree} 2>/dev/null && pwd`" - if test -z "${real_libmpeg2_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_libmpeg2_tree}]) - fi - if test -f "${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a" - then - dnl Use a custom libmpeg2 - AC_MSG_RESULT(${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a) - VLC_ADD_PLUGIN([libmpeg2]) - VLC_ADD_LIBS([libmpeg2],[-L${real_libmpeg2_tree}/libmpeg2/.libs -lmpeg2]) - VLC_ADD_CFLAGS([libmpeg2],[-I${real_libmpeg2_tree}/include]) - else - dnl The given libmpeg2 wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}]) - fi - ],[ - PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[ - VLC_ADD_PLUGIN([libmpeg2]) - VLC_ADD_LIBS([libmpeg2], $LIBMPEG2_LIBS) - VLC_ADD_CFLAGS([libmpeg2], $LIBMPEG2_CFLAGS) - ], - AC_MSG_WARN([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ . Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])) - ]) -fi +PKG_ENABLE_MODULES_VLC([LIBMPEG2], [], [libmpeg2 > 0.3.2], [libmpeg2 decoder support], [auto]) dnl dnl Vorbis plugin dnl -AC_ARG_ENABLE(vorbis, - [ --enable-vorbis Vorbis decoder support (default enabled)]) -if test "${enable_vorbis}" != "no" -then - AC_ARG_WITH(vorbis-tree, - [ --with-vorbis-tree=PATH vorbis tree for static linking]) - if test -n "${with_vorbis_tree}" - then - AC_MSG_CHECKING(for libvorbis.a in ${with_vorbis_tree}) - real_vorbis_tree="`cd ${with_vorbis_tree} 2>/dev/null && pwd`" - if test -z "${real_vorbis_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_vorbis_tree}]) - fi - if test -f "${real_vorbis_tree}/lib/.libs/libvorbis.a" - then - dnl Use a custom vorbis - AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a) - VLC_ADD_PLUGIN([vorbis]) - VLC_ADD_LIBS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a]) - VLC_ADD_CFLAGS([vorbis],[-I${real_vorbis_tree}/include]) - else - dnl The given vorbis wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_vorbis_tree}/lib/.libs/libvorbis.a, make sure you compiled vorbis in ${with_vorbis_tree}]) - fi - else - AC_CHECK_HEADERS(vorbis/codec.h, [ - VLC_ADD_PLUGIN([vorbis]) - VLC_ADD_LIBS([vorbis],[-lvorbis -logg -lm]) ],[]) - - AC_CHECK_HEADERS(vorbis/vorbisenc.h, [ - VLC_ADD_LIBS([vorbis],[-lvorbisenc -lm]) ],[]) - fi -fi +PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorbis decoder and encoder], [auto]) dnl dnl Tremor plugin @@ -3514,47 +3150,7 @@ fi dnl dnl Speex plugin dnl -AC_ARG_ENABLE(speex, - [ --enable-speex Speex decoder support (default enabled)]) -if test "${enable_speex}" != "no" -then - AC_ARG_WITH(speex-tree, - [ --with-speex-tree=PATH speex tree for static linking]) - if test -n "${with_speex_tree}" - then - AC_MSG_CHECKING(for libspeex.a in ${with_speex_tree}) - real_speex_tree="`cd ${with_speex_tree} 2>/dev/null && pwd`" - if test -z "${real_speex_tree}" - then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_speex_tree}]) - fi - if test -f "${real_speex_tree}/libspeex/.libs/libspeex.a" - then - dnl Use a custom speex - AC_MSG_RESULT(${real_speex_tree}/libspeex/.libs/libspeex.a) - VLC_ADD_PLUGIN([speex]) - VLC_ADD_LIBS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a]) - VLC_ADD_CFLAGS([speex],[-I${real_speex_tree}/include]) - else - dnl The given speex wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_speex_tree}/libspeex/.libs/libspeex.a, make sure you compiled speex in ${with_speex_tree}]) - fi - else - AC_CHECK_HEADERS(speex/speex.h, [ - LDFLAGS="${LDFLAGS_save} ${LIBS_speex}" - AC_CHECK_LIB(speex, speex_decode_int, [ - VLC_ADD_PLUGIN([speex]) - VLC_ADD_LIBS([speex],[-lspeex]) ], - [ AC_MSG_RESULT([no]) - AC_MSG_WARN([Your libspeex is too old, please get the development - version.]) ],[]) - LDFLAGS="${LDFLAGS_save}" - ],[]) - fi -fi +PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto]) dnl dnl tarkin decoder plugin @@ -3587,50 +3183,17 @@ fi dnl dnl theora decoder plugin dnl -AC_ARG_ENABLE(theora, -[ --enable-theora experimental theora codec (default disabled)]) -if test "${enable_theora}" = "yes" -then - AC_CHECK_HEADERS(theora/theora.h, [ - AC_CHECK_LIB(theora, theora_granule_time, [ - VLC_ADD_PLUGIN([theora]) - theora_libs="-ltheora -logg" - VLC_ADD_LIBS([theora],[${theora_libs}]) ],[ - AC_MSG_ERROR([libtheora 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.])], - [-logg]) - ]) -fi +PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theora >= 1.0], [experimental theora codec], [auto]) dnl -dnl dirac decoder plugin +dnl dirac encoder plugin dnl -AC_ARG_ENABLE(dirac, -[ --enable-dirac experimental dirac codec (default disabled)]) -if test "${enable_dirac}" = "yes"; then - PKG_CHECK_MODULES(DIRAC,[dirac >= 0.10.0], [ - VLC_ADD_PLUGIN([dirac]) - VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) - VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ - AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.]) - ]) -fi +PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) dnl dnl schroedinger decoder plugin (for dirac format video) dnl -AC_ARG_ENABLE(schroedinger, -[ --disable-schroedinger high performance dirac codec (default enabled)]) -if test "${enable_schroedinger}" != "no"; then - PKG_CHECK_MODULES(SCHROEDINGER,[schroedinger-1.0 >= 1.0.6], [ - VLC_ADD_PLUGIN([schroedinger]) - VLC_ADD_CFLAGS([schroedinger],[$SCHROEDINGER_CFLAGS]) - VLC_ADD_LIBS([schroedinger],[$SCHROEDINGER_LIBS]) ], [ - AS_IF([test "x${enable_schroedinger}" != "x"], [ - AC_MSG_ERROR([${SCHROEDINGER_PKG_ERRORS}]) - ]) -]) -fi +PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) dnl dnl PNG decoder module @@ -3722,19 +3285,7 @@ fi dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl -AC_ARG_ENABLE(fluidsynth, - [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default enabled)]) -AS_IF([test "x${enable_fluidsynth}" != "xno"], [ - PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth, [ - VLC_ADD_PLUGIN(fluidsynth) - VLC_ADD_CFLAGS(fluidsynth, [${FLUIDSYNTH_CFLAGS}]) - VLC_ADD_LIBS(fluidsynth, [${FLUIDSYNTH_LIBS}]) - ], [ - AS_IF([test "x${enable_fluidsynth}" != "x"], [ - AC_MSG_ERROR([${FLUIDSYNTH_PKG_ERRORS}]) - ]) - ]) -]) +PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) dnl dnl Teletext Modules @@ -3744,55 +3295,41 @@ dnl uncompatible dnl AC_ARG_ENABLE(zvbi, AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with - libzvbi (default enabled)])) + libzvbi (default enabled)])) AC_ARG_ENABLE(telx, AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with - zvbi) (default enabled if zvbi is absent)])) + zvbi) (default enabled if zvbi is absent)])) AS_IF( [test "${enable_zvbi}" != "no"],[ PKG_CHECK_MODULES(ZVBI, - zvbi-0.2 >= 0.2.25, - [ - VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) - VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) + zvbi-0.2 >= 0.2.25, + [ + VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) + if test "${SYS}" = "mingw32"; then + VLC_ADD_LIBS([zvbi],[ -lpthreadGC2]) + fi + VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) VLC_ADD_PLUGIN([zvbi]) - AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) - AS_IF( [test "${enable_telx}" = "yes"],[ - AC_MSG_WARN([The zvbi and telx modules are uncompatibles. - Using zvbi.]) - ]) - ],[ - AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) - ]) + AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) + AS_IF( [test "${enable_telx}" = "yes"],[ + AC_MSG_WARN([The zvbi and telx modules are uncompatibles. + Using zvbi.]) + ]) + ],[ + AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) + ]) ]) AS_IF( [test "${enable_telx}" != "no" ],[ VLC_ADD_PLUGIN([telx]) ]) -dnl -dnl asa/csri subtitle rendering module -dnl -AC_ARG_ENABLE(csri, - [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) -AS_IF( [test "${enable_csri}" = "yes"], [ - PKG_CHECK_MODULES(CSRI, - csri >= 0.1.0, - [ - VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS]) - VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS]) - VLC_ADD_PLUGIN([csri]) - ],[ - AC_MSG_WARN([CSRI helper library not found]) - ]) - ]) - dnl dnl libass subtitle rendering module dnl AC_ARG_ENABLE(libass, [ --enable-libass Subtitle support using libass (default disabled)]) AS_IF( [test "${enable_libass}" = "yes"], [ - PKG_CHECK_MODULES(LIBASS, libass >= 0.9.5, + PKG_CHECK_MODULES(LIBASS, libass >= 0.9.6, [ VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS]) VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) @@ -3801,7 +3338,7 @@ AS_IF( [test "${enable_libass}" = "yes"], [ AC_CHECK_HEADERS(fontconfig/fontconfig.h, [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) if test "${SYS}" = "mingw32"; then - VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz -lxml2]) + VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz]) else VLC_ADD_LIBS([libass],[-lfontconfig]) fi @@ -3822,8 +3359,8 @@ AS_IF( [test "${enable_asademux}" = "yes"], [ [ VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS]) VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS]) - if test "${SYS}" = "mingw32"; then - VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC]) + if test "${SYS}" = "mingw32"; then + VLC_ADD_CPPFLAGS([asademux],[-DPCRE_STATIC]) fi VLC_ADD_PLUGIN([asademux]) ],[ @@ -3874,18 +3411,7 @@ AS_IF([test "${enable_kate}" != "no"], [ dnl dnl tiger decoder plugin dnl -AC_ARG_ENABLE(tiger, -[ --enable-tiger Tiger rendering library for Kate streams (default enabled)]) -AS_IF([test "${enable_tiger}" != "no"], [ - PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [ - AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.]) - VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS]) - VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[ - AS_IF([test "x${enable_tiger}" != "x"], [ - AC_MSG_ERROR([libtiger does not appear to be installed on your system.]) - ]) - ]) -]) +PKG_ENABLE_MODULES_VLC([TIGER], [], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto]) dnl @@ -3911,21 +3437,7 @@ AC_ARG_ENABLE(x11, CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" AS_IF([test "${enable_x11}" != "no"], [ - AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGIN([x11_screen]) - VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}]) - VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - - VLC_ADD_PLUGIN([panoramix]) - VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) - - VLC_ADD_PLUGIN([x11]) - VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) - - AC_CHECK_LIB(Xext, XShmAttach, [VLC_ADD_LIBS([x11],[-lXext])]) - ]) + AC_CHECK_HEADERS(X11/Xlib.h) dnl Check for DPMS AC_CHECK_HEADERS(X11/extensions/dpms.h, [ @@ -3942,26 +3454,6 @@ dnl Check for DPMS ]) ]) -dnl -dnl XVideo module -dnl (enabled by default except on win32) -dnl -AC_ARG_ENABLE(xvideo, - [ --enable-xvideo XVideo support (default enabled)],, [ - enable_xvideo="$enable_x11" -]) -AS_IF([test "${enable_xvideo}" != "no"], [ - AC_CHECK_HEADERS(X11/extensions/Xv.h, [ - CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" - AC_CHECK_LIB(Xv,XvPutImage,[ - VLC_ADD_PLUGIN([xvideo]) - VLC_ADD_CPPFLAGS([xvideo],[${X_CFLAGS}]) - VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) - ]) - CFLAGS="${CFLAGS_save}" - ]) -]) - dnl dnl GLX module dnl (enabled by default except on win32) @@ -4001,68 +3493,6 @@ AS_IF([test "${enable_xvmc}" != "no"], [ ]) ]) -dnl -dnl Check for the Xinerama extension -dnl -AC_ARG_ENABLE(xinerama, - [ --enable-xinerama Xinerama support (default enabled)],, [ - enable_xinerama="$enable_xvideo" -]) -AS_IF([test "$enable_xinerama" != "no"], [ - ac_cv_have_xinerama="no" - CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" - AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ - AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ - VLC_ADD_LIBS([xvideo],[-lXinerama_pic]) - VLC_ADD_LIBS([x11],[-lXinerama_pic]) - VLC_ADD_LIBS([glx],[-lXinerama_pic]) - VLC_ADD_LIBS([xvmc],[-lXinerama_pic]) - ac_cv_have_xinerama="yes" - ],[ - AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[ - VLC_ADD_LIBS([xvideo],[-lXinerama]) - VLC_ADD_LIBS([x11],[-lXinerama]) - VLC_ADD_LIBS([glx],[-lXinerama]) - VLC_ADD_LIBS([xvmc],[-lXinerama]) - ac_cv_have_xinerama="yes" - ]) - ]) - ]) - if test "${ac_cv_have_xinerama}" = "yes"; then - AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed]) - fi - -dnl -dnl Check for XF86VidMode extension -dnl - ac_cv_have_xf86vidmode="no" - AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[ - AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[ - VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic]) - VLC_ADD_LIBS([x11],[-lXxf86vm_pic]) - VLC_ADD_LIBS([glx],[-lXxf86vm_pic]) - VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic]) - ac_cv_have_xf86vidmode="yes" - ],[ - AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[ - VLC_ADD_LIBS([xvideo],[-lXxf86vm]) - VLC_ADD_LIBS([x11],[-lXxf86vm]) - VLC_ADD_LIBS([glx],[-lXxf86vm]) - VLC_ADD_LIBS([xvmc],[-lXxf86vm]) - ac_cv_have_xf86vidmode="yes" - ]) - ]) - ],[true], -[#ifdef HAVE_X11_XLIB_H -# include -#endif] - ) - AS_IF([test "${ac_cv_have_xf86vidmode}" = "yes"], - [AC_DEFINE(HAVE_XF86VIDMODE, 1, [Define this if you have libXxf86vm installed]) - ]) - CFLAGS="${CFLAGS_save}" -]) - dnl End of Xlib tests CPPFLAGS="${CPPFLAGS_save}" @@ -4078,6 +3508,10 @@ AC_ARG_ENABLE(xcb, enable_xcb="no" ]) ]) +AC_ARG_ENABLE(xvideo, + [ --enable-xvideo XVideo support (default enabled)],, [ + enable_xvideo="$enable_xcb" +]) AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XPROTO, [xproto]) @@ -4086,6 +3520,7 @@ AS_IF([test "${enable_xcb}" != "no"], [ PKG_CHECK_MODULES(XCB, [xcb]) PKG_CHECK_MODULES(XCB_SHM, [xcb-shm]) VLC_ADD_PLUGIN([xcb]) + VLC_ADD_PLUGIN([xcb_screen]) AS_IF([test "${enable_xvideo}" != "no"], [ PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [ @@ -4098,6 +3533,12 @@ AS_IF([test "${enable_xcb}" != "no"], [ ]) ]) + PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [ + VLC_ADD_PLUGIN([panoramix]) + VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}]) + VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}]) + ], [true]) + dnl xcb-utils PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms]) @@ -4241,11 +3682,10 @@ then VLC_ADD_PLUGIN([freetype]) have_freetype=yes VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) - VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) if test "${SYS}" = "mingw32"; then - VLC_ADD_LIBS([freetype skins2],[-lxml2]) - VLC_ADD_LIBS([freetype],[-liconv]) + VLC_ADD_LIBS([freetype],[-liconv -lz]) fi + VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) if test "${enable_fontconfig}" != "no" then AC_CHECK_HEADERS(fontconfig/fontconfig.h, @@ -4254,6 +3694,16 @@ then AC_CHECK_HEADERS(Carbon/Carbon.h, [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) fi + + dnl fribidi support + if test "${enable_fribidi}" != "no" + then + PKG_CHECK_MODULES(FRIBIDI, fribidi, [ + VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI]) + VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}]) + ]) + fi + ],[ have_freetype=no AS_IF([ test "${enable_freetype}" = "yes"],[ @@ -4263,48 +3713,17 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice ]) ]) - dnl fribidi support - if test "${enable_fribidi}" != "no" - then - PKG_CHECK_MODULES(FRIBIDI, fribidi, [ - VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI]) - VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}]) - ]) - fi fi dnl dnl libxml2 module dnl -AC_ARG_ENABLE(libxml2, - [ --enable-libxml2 libxml2 support (default enabled)]) -AS_IF([test "${enable_libxml2}" != "no"], [ - PKG_CHECK_MODULES([XML2], [libxml-2.0 >= 2.5], [ - VLC_ADD_CPPFLAGS([xml],[${XML2_CFLAGS}]) - VLC_ADD_LIBS([xml],[${XML2_LIBS}]) - VLC_ADD_PLUGIN([xml]) - ], [ - AS_IF([test "x${enable_xml2}" != "x"], [ - AC_MSG_ERROR([Could not find libxml version 2.5 or higher]) - ]) - ]) -]) +PKG_ENABLE_MODULES_VLC([libxml2], [], [libxml-2.0 >= 2.5], [libxml2 support],[auto]) dnl dnl SVG module dnl -AC_ARG_ENABLE(svg, - [ --enable-svg SVG support (default disabled)]) -if test "${enable_svg}" = "yes" -then - PKG_CHECK_MODULES(SVG, - librsvg-2.0 >= 2.9.0, - [ - VLC_ADD_LIBS([svg],[$SVG_LIBS]) - VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) - VLC_ADD_PLUGIN([svg]) ], - [AC_MSG_WARN(SVG library not found)]) -fi +PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) dnl dnl Snapshot vout module (with cache) @@ -4388,9 +3807,9 @@ then if test -z "${with_directx}" then AC_CHECK_HEADERS(ddraw.h, - [ VLC_ADD_PLUGIN([vout_directx]) + [ VLC_ADD_PLUGIN([directx]) VLC_ADD_PLUGIN([aout_directx]) - VLC_ADD_LIBS([vout_directx],[-lgdi32]) + VLC_ADD_LIBS([directx],[-lgdi32]) ]) AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGIN([glwin32]) @@ -4404,10 +3823,10 @@ then AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h then - VLC_ADD_PLUGIN([vout_directx]) + VLC_ADD_PLUGIN([directx]) VLC_ADD_PLUGIN([aout_directx]) - VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) - VLC_ADD_LIBS([vout_directx],[-lgdi32]) + VLC_ADD_CPPFLAGS([directx aout_directx],[-I${with_directx}]) + VLC_ADD_LIBS([directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -4574,32 +3993,7 @@ fi dnl dnl libcaca plugin dnl -AC_ARG_ENABLE(caca, - [ --enable-caca libcaca output (default disabled)]) -if test "${enable_caca}" = "yes" -then - CACA_PATH="${PATH}" - AC_ARG_WITH(caca-config-path, - [ --with-caca-config-path=PATH caca-config path (default search in \$PATH)], - [ if test "${with_caca_config_path}" != "no" - then - CACA_PATH="${with_caca_config_path}:${PATH}" - fi ]) - AC_PATH_PROG(CACA_CONFIG, caca-config, no, ${CACA_PATH}) - if test "${CACA_CONFIG}" != "no" - then - VLC_ADD_PLUGIN([caca]) - VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) - VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`]) - AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include - caca_event_t ev;]], - [[ev.type = 0;]] - )], - [], - [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])] - ) - fi -fi +PKG_ENABLE_MODULES_VLC([caca], [], [caca >= 0.99.beta1], [libcaca output],[auto]) dnl dnl win32 GDI plugin @@ -4645,59 +4039,17 @@ fi dnl dnl Pulseaudio module dnl -AC_ARG_ENABLE(pulse, - [ --enable-pulse Pulseaudio support (default enabled)]) - if test "${enable_pulse}" != "no" - then - PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.11, - [ VLC_ADD_PLUGIN([pulse]) - VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}]) - VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])], - [AC_MSG_WARN(pulseaudio library not found)]) - fi +PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto]) dnl dnl Portaudio module dnl -AC_ARG_ENABLE(portaudio, - [ --enable-portaudio Portaudio library support (default disabled)], - [if test "${enable_portaudio}" = "yes" - then - VLC_ADD_PLUGIN([portaudio]) - VLC_ADD_CXXFLAGS([portaudio],[]) - if test "${SYS}" = "mingw32"; then - VLC_ADD_LIBS([portaudio],[-lportaudio -lwinmm -lole32]) - else - VLC_ADD_LIBS([portaudio],[-lportaudio]) - fi - fi]) +PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto]) dnl dnl ALSA module dnl -AC_ARG_ENABLE(alsa, - [ --enable-alsa ALSA sound support for Linux (default enabled)]) -if test "${enable_alsa}" != "no" -then - AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_alsa="true", have_alsa="false"),have_alsa="false") - if test "${have_alsa}" = "true" - then - CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API - #include ], - [snd_pcm_hw_params_get_period_time(0,0,0);], - AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) - VLC_ADD_PLUGIN([alsa]) - VLC_ADD_LIBS([alsa],[-lasound -lm -ldl]) - VLC_ADD_PLUGIN([access_alsa]) - VLC_ADD_LIBS([access_alsa],[-lasound -lm -ldl]) - else - if test "${enable_alsa}" = "yes"; then - AC_MSG_ERROR([Could not find ALSA development headers]) - fi - fi -fi +PKG_ENABLE_MODULES_VLC([ALSA], [], [alsa >= 1.0.0], [Alsa sound support for linux], [auto]) dnl dnl win32 waveOut plugin @@ -4747,17 +4099,9 @@ fi dnl dnl JACK modules dnl -AC_ARG_ENABLE(jack, - [ --enable-jack JACK audio I/O modules (default disabled)],, - [enable_jack="no"]) +PKG_ENABLE_MODULES_VLC([JACK], [jack], [jack], [JACK audio I/O modules],[auto]) +PKG_ENABLE_MODULES_VLC([JACK], [access_jack], [jack], [JACK audio I/O modules],[auto]) -AS_IF([test "${enable_jack}" != "no"], [ - AC_CHECK_HEADERS(jack/jack.h, [ - VLC_ADD_PLUGIN([access_jack]) - VLC_ADD_PLUGIN([jack]) - VLC_ADD_LIBS([access_jack jack],[-ljack]) - ],[AC_MSG_ERROR([cannot find JACK headers])]) -]) dnl dnl CyberLink for C++ UPnP stack @@ -4834,25 +4178,7 @@ class testclass : public SearchResponseListener, public MediaPlayer dnl dnl UPnP Plugin (Intel SDK) dnl -AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])) - -VLC_ADD_CXXFLAGS([upnp_intel], [ ]) -AS_IF([test "x${enable_upnp}" != "xno"], [ - AC_CHECK_LIB([upnp], [UpnpInit], [has_upnp="yes"], [has_upnp="no"], [-lpthread]) - AS_IF([test "x${enable_upnp}" != "x" && test "${has_upnp}" = "no"], [ - AC_MSG_ERROR([cannot find Intel UPnP SDK (libupnp)]) - ]) - AS_IF([test "${has_upnp}" = "yes"], [ - VLC_ADD_LIBS([upnp_intel], [-lupnp -lixml]) - ]) -], [ - has_upnp="no" -]) - -AS_IF([test "${has_upnp}" = "yes"], [ - VLC_ADD_PLUGIN([upnp_intel]) -]) +PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto]) dnl @@ -4974,7 +4300,7 @@ AS_IF([test "${enable_qt4}" != "no"], [ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"], [ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11]) ], [ - VLC_ADD_LIBS([qt4],[$QT4_LIBS]) + VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32]) ]) QT4LOCALEDIR="$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/" AC_SUBST(QT4LOCALEDIR) @@ -5068,6 +4394,8 @@ then VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices]) VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) + VLC_ADD_LDFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle -Wl,-framework,Sparkle]) + VLC_ADD_OBJCFLAGS([macosx], [-F\\\${top_srcdir}/extras/contrib/Sparkle]) dnl For bug report VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook]) VLC_ADD_LDFLAGS([macosx qtcapture], [-Wl,-framework,QTKit]) @@ -5075,19 +4403,13 @@ then VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore]) VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo]) - VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] ) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] ) VLC_ADD_PLUGIN([access_eyetv]) VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([macosx]) VLC_ADD_PLUGIN([minimal_macosx]) - - ORIGCFLAGS=$CFLAGS - CFLAGS="$CFLAGS -x objective-c" - AC_TRY_COMPILE([#import ],, - [VLC_ADD_PLUGIN([opengllayer]) - VLC_ADD_OBJCFLAGS([opengllayer])],[]) - CFLAGS=$ORIGCFLAGS + VLC_ADD_PLUGIN([opengllayer]) fi dnl @@ -5181,76 +4503,14 @@ then fi dnl -dnl OpenGL visualisation plugin +dnl goom visualization plugin dnl -AC_ARG_ENABLE(galaktos, - [ --enable-galaktos OpenGL visualisation plugin (default disabled)]) -if test "${enable_galaktos}" = "yes" -then - AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ - VLC_ADD_PLUGIN([galaktos]) - if test "${SYS}" != "mingw32"; then - VLC_ADD_LIBS([galaktos],[${X_LIBS} -lGL -lGLU]) - else - VLC_ADD_LIBS([galaktos],[-lopengl32]) - fi - ]) -fi +PKG_ENABLE_MODULES_VLC([goom], [], [libgoom2], [goom visualization plugin], [auto]) dnl -dnl goom visualization plugin +dnl libprojectM visualization plugin dnl -AC_ARG_ENABLE(goom, -[ --enable-goom goom visualisation plugin (default disabled)]) -if test "${enable_goom}" = "yes" -then - AC_ARG_WITH(goom-tree, - [ --with-goom-tree=PATH goom tree for static linking (required)]) - - dnl - dnl test for --with-goom-tree - dnl - if test "${with_goom_tree}" != "no" -a -n "${with_goom_tree}"; then - AC_MSG_CHECKING(for libgoom2.a in ${with_goom_tree}) - real_goom_tree="`cd ${with_goom_tree} 2>/dev/null && pwd`" - if test -z "${real_goom_tree}"; then - dnl The given directory can't be found - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot cd to ${with_goom_tree}]) - fi - if test -f "${real_goom_tree}/src/.libs/libgoom2.a"; then - AC_MSG_RESULT(${real_goom_tree}/src/.libs/libgoom2.a) - VLC_ADD_PLUGIN([goom]) - VLC_ADD_LIBS([goom],[-L${real_goom_tree}/src/.libs -lgoom2]) - VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree}/src -DUSE_GOOM_TREE]) - else - dnl The given libgoom2 wasn't built, try to look for the old goom - AC_MSG_RESULT(no) - AC_MSG_CHECKING(for libgoom.a in ${with_goom_tree}) - if test -f "${real_goom_tree}/libgoom.a"; then - AC_MSG_RESULT(${real_goom_tree}/libgoom.a) - VLC_ADD_PLUGIN([goom]) - VLC_ADD_LIBS([goom],[-L${real_goom_tree} -lgoom]) - VLC_ADD_CPPFLAGS([goom],[-I${real_goom_tree} -DUSE_GOOM_TREE -DOLD_GOOM]) - else - dnl The given libgoom wasn't built - AC_MSG_RESULT(no) - AC_MSG_ERROR([cannot find ${real_goom_tree}/src/.libs/libgoom2.a, make sure you compiled goom in ${with_goom_tree}]) - fi - fi - else - AC_CHECK_HEADERS(goom/goom.h, [ - LDFLAGS="${LDFLAGS_save} ${LIBS_goom}" - AC_CHECK_LIB(goom2, goom_init, [ - VLC_ADD_PLUGIN([goom]) - VLC_ADD_LIBS([goom],[-lgoom2]) - ],[ - AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.]) - ]) - LDFLAGS="${LDFLAGS_save}" - ]) - fi -fi +PKG_ENABLE_MODULES_VLC([projectm], [], [libprojectM], [projectM visualization plugin], [auto]) dnl dnl AtmoLight (homebrew AmbiLight) @@ -5258,7 +4518,7 @@ dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then AC_ARG_ENABLE(atmo, AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) - (default enabled)])) + (default enabled)])) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) @@ -5268,19 +4528,15 @@ fi dnl dnl Bonjour services discovery +PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) + dnl -AC_ARG_ENABLE(bonjour, - [ --enable-bonjour Bonjour services discovery (default enabled)]) -AS_IF([test "${enable_bonjour}" != "no"], [ - PKG_CHECK_MODULES(BONJOUR, avahi-client >= 0.6, [ - AC_DEFINE(HAVE_AVAHI_CLIENT, 1, [Define to 1 if you have libavahi-client]) - VLC_ADD_LIBS([bonjour access_output_http],[$BONJOUR_LIBS]) - VLC_ADD_CFLAGS([bonjour access_output_http],[$BONJOUR_CFLAGS]) - VLC_ADD_PLUGIN([bonjour]) - ], [ - AC_MSG_WARN(avahi-client library not found) - ]) -]) +dnl HAL services discovery +PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto]) + +dnl +dnl MTP devices services discovery +PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto]) dnl dnl Lirc plugin @@ -5562,8 +4818,8 @@ then [ AC_PATH_PROGS(MOZILLA_CONFIG, [mozilla-config seamonkey-config xulrunner-config], - AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) - ) + [no]) + test "${MOZILLA_CONFIG}" = "no" && AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) ] ) dnl pkg-config failed but we might have found a mozilla-config @@ -5657,13 +4913,13 @@ AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) dnl Tests for Osso and Xsp AC_CHECK_LIB(osso, osso_display_blanking_pause, [ PKG_CHECK_MODULES(GLIB2, glib-2.0, [ - VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) - VLC_ADD_LIBS([x11 xvideo xvmc glx omapfb],[-losso]) + VLC_ADD_CPPFLAGS([xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) + VLC_ADD_LIBS([xvmc glx omapfb],[-losso]) ]) ]) AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ - VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx],[-DHAVE_XSP]) - VLC_ADD_LIBS([x11 xvideo xvmc glx],[-lXsp]) + VLC_ADD_CPPFLAGS([xvmc glx],[-DHAVE_XSP]) + VLC_ADD_LIBS([xvmc glx],[-lXsp]) ]) dnl @@ -5936,7 +5192,6 @@ AC_CONFIG_FILES([ modules/services_discovery/Makefile modules/stream_filter/Makefile modules/stream_out/Makefile - modules/stream_out/transrate/Makefile modules/video_chroma/Makefile modules/video_filter/Makefile modules/video_filter/atmo/Makefile @@ -5947,7 +5202,6 @@ AC_CONFIG_FILES([ modules/video_output/x11/Makefile modules/visualization/Makefile modules/visualization/visual/Makefile - modules/visualization/galaktos/Makefile ]) dnl Generate makefiles @@ -5967,7 +5221,7 @@ echo '#! /bin/sh' >compile echo rm -f .error\$\$ >>compile echo ERROR=0 >>compile echo export PATH=$PATH LANG=C >>compile -echo "(make \$@ 2>&1 || touch .error\$\$)| \\" >>compile +echo "(make V=1 \$@ 2>&1 || touch .error\$\$)| \\" >>compile echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >>compile echo test -f .error\$\$ \&\& ERROR=1 >>compile echo rm -f .error\$\$ >>compile