X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=ef62ea7957b86039e6d0fc5377733092ab10264b;hb=1b7f5b823ce67587400de39c365455e153be5994;hp=4d628e6dfadc497edfed69d0f9583a6e621b1cb7;hpb=314bd6d6494fe9b9b948532595bf081be49a46ac;p=vlc diff --git a/configure.ac b/configure.ac index 4d628e6dfa..ef62ea7957 100644 --- a/configure.ac +++ b/configure.ac @@ -368,9 +368,6 @@ case "${host_os}" in ;; 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 @@ -573,8 +570,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 ]) @@ -596,12 +593,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,[ @@ -652,7 +651,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 @@ -719,7 +718,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 freetype mod mpc dmo quicktime realaudio realvideo galaktos opengl],[-lm]) + VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec stream_out_transrate 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]) @@ -944,12 +943,6 @@ fi AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) -dnl Check for hal -PKG_ENABLE_MODULES_VLC([HAL], [hal >= 0.5.0], [Linux HAL services discovery], [auto]) - -dnl Check for mtp -PKG_ENABLE_MODULES_VLC([MTP],[libmtp >= 0.3.0],[MTP devices support],[auto]) - dnl Check for dbus AC_ARG_ENABLE(dbus, [ --enable-dbus Linux D-BUS message bus system (default enabled)]) @@ -1675,9 +1668,6 @@ AS_IF([test "${enable_sout}" != "no"], [ ]) AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"]) -dnl Check for libshout -PKG_ENABLE_MODULES_VLC([access_output_shout], [shout >= 2.1], [libshout output plugin], [auto]) - dnl Lua modules AC_ARG_ENABLE(lua, AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface @@ -1731,7 +1721,7 @@ AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"]) dnl dnl libproxy support dnl -PKG_ENABLE_MODULES_VLC([LIBPROXY], [libproxy-1.0], [libproxy support], [auto]) +PKG_ENABLE_MODULES_VLC([LIBPROXY], [], [libproxy-1.0], [libproxy support], [auto]) dnl @@ -1767,7 +1757,7 @@ AS_IF([test "${enable_growl}" != "no"], [ dnl dnl Libnotify notification plugin dnl -PKG_ENABLE_MODULES_VLC([NOTIFY], [libnotify], [libnotify notification], [auto]) +PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto]) dnl dnl Audioscrobbler plugin @@ -1934,8 +1924,8 @@ dnl dnl - special access module for dc1394 input dnl - dv module: digital video module check for libraw1394 dnl -PKG_ENABLE_MODULES_VLC([dc1394], [libraw1394 >= 2.0.1 libdc1394 >= 1.0.0], [dc1394 access module], [auto]) -PKG_ENABLE_MODULES_VLC([access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto]) +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 @@ -2324,7 +2314,7 @@ fi dnl dnl gnomeVFS access module dnl -PKG_ENABLE_MODULES_VLC([GNOMEVFS], [gnome-vfs-2.0], [GnomeVFS access module], [auto]) +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. @@ -2561,9 +2551,14 @@ AC_CHECK_FUNCS(inet_ntop,[ dnl dnl ogg demux plugin dnl -PKG_ENABLE_MODULES_VLC([OGG], [ogg >= 1.0], [Ogg demux support], [auto]) +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]) + 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 @@ -2977,48 +2972,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 @@ -3159,65 +3113,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 -PKG_ENABLE_MODULES_VLC([FLAC], [flac], [libflac decoder/encoder support], [auto]) +PKG_ENABLE_MODULES_VLC([FLAC], [], [flac], [libflac decoder/encoder support], [auto]) dnl dnl Libmpeg2 plugin dnl -PKG_ENABLE_MODULES_VLC([LIBMPEG2], [libmpeg2 > 0.3.2], [libmpeg2 decoder support], [auto]) +PKG_ENABLE_MODULES_VLC([LIBMPEG2], [], [libmpeg2 > 0.3.2], [libmpeg2 decoder support], [auto]) dnl dnl Vorbis plugin dnl -PKG_ENABLE_MODULES_VLC([VORBIS], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorbis decoder and encoder], [auto]) +PKG_ENABLE_MODULES_VLC([VORBIS], [], [ogg vorbis >= 1.1 vorbisenc >= 1.1], [Vorbis decoder and encoder], [auto]) dnl dnl Tremor plugin @@ -3235,7 +3146,7 @@ fi dnl dnl Speex plugin dnl -PKG_ENABLE_MODULES_VLC([SPEEX], [ogg speex >= 1.0.5], [Speex decoder support], [auto]) +PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto]) dnl dnl tarkin decoder plugin @@ -3268,17 +3179,17 @@ fi dnl dnl theora decoder plugin dnl -PKG_ENABLE_MODULES_VLC([THEORA], [ogg theora >= 1.0], [experimental theora codec], [auto]) +PKG_ENABLE_MODULES_VLC([THEORA], [], [ogg theora >= 1.0], [experimental theora codec], [auto]) dnl dnl dirac encoder plugin dnl -PKG_ENABLE_MODULES_VLC([DIRAC], [dirac >= 0.10.0], [dirac encoder], [auto], [], [ -lstdc++]) +PKG_ENABLE_MODULES_VLC([DIRAC], [], [dirac >= 0.10.0], [dirac encoder], [auto]) dnl dnl schroedinger decoder plugin (for dirac format video) dnl -PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) +PKG_ENABLE_MODULES_VLC([SCHROEDINGER], [], [schroedinger-1.0 >= 1.0.6], [dirac decoder using schroedinger], [auto]) dnl dnl PNG decoder module @@ -3370,7 +3281,7 @@ fi dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl -PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) +PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto]) dnl dnl Teletext Modules @@ -3414,7 +3325,7 @@ 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]) @@ -3496,7 +3407,7 @@ AS_IF([test "${enable_kate}" != "no"], [ dnl dnl tiger decoder plugin dnl -PKG_ENABLE_MODULES_VLC([TIGER], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto]) +PKG_ENABLE_MODULES_VLC([TIGER], [], [tiger >= 0.3.1], [Tiger rendering library for Kate streams],[auto]) dnl @@ -3886,24 +3797,12 @@ 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 -PKG_ENABLE_MODULES_VLC([SVG], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) +PKG_ENABLE_MODULES_VLC([SVG], [], [librsvg-2.0 >= 2.9.0], [SVG rendering library],[auto]) dnl dnl Snapshot vout module (with cache) @@ -4173,32 +4072,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 @@ -4244,50 +4118,17 @@ fi dnl dnl Pulseaudio module dnl -PKG_ENABLE_MODULES_VLC([PULSE], [libpulse >= 0.9.11], [Pulseaudio support], [auto]) +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 @@ -4337,17 +4178,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 @@ -4424,25 +4257,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 @@ -4766,82 +4581,15 @@ then VLC_ADD_PLUGIN([visual]) fi -dnl -dnl OpenGL visualisation 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 - dnl dnl goom 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([goom], [], [libgoom2], [goom visualization plugin], [auto]) dnl dnl libprojectM visualization plugin dnl -PKG_ENABLE_MODULES_VLC([projectm], [libprojectM], [projectM visualization plugin], [auto]) +PKG_ENABLE_MODULES_VLC([projectm], [], [libprojectM], [projectM visualization plugin], [auto]) dnl dnl AtmoLight (homebrew AmbiLight) @@ -4859,8 +4607,15 @@ fi dnl dnl Bonjour services discovery +PKG_ENABLE_MODULES_VLC([BONJOUR], [], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) + +dnl +dnl HAL services discovery +PKG_ENABLE_MODULES_VLC([HAL], [], [hal >= 0.5.0], [Linux HAL services discovery], [auto]) + dnl -PKG_ENABLE_MODULES_VLC([BONJOUR], [avahi-client >= 0.6], [Bonjour services discovery], [auto]) +dnl MTP devices services discovery +PKG_ENABLE_MODULES_VLC([MTP], [], [libmtp >= 0.3.0],[MTP devices support],[auto]) dnl dnl Lirc plugin @@ -5527,7 +5282,6 @@ AC_CONFIG_FILES([ modules/video_output/x11/Makefile modules/visualization/Makefile modules/visualization/visual/Makefile - modules/visualization/galaktos/Makefile ]) dnl Generate makefiles