X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=279442e0dfa36da8c06b5c96c7915edf16caa35d;hb=f1590d98ae55f55c1c5df515a5eabf68e1190d1e;hp=36ad4144ce0264869ed413d106fc8f8f07f38a20;hpb=40f2e51765f4b1d65283fc5184a33ad28096c613;p=vlc diff --git a/configure.ac b/configure.ac index 36ad4144ce..279442e0df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,18 +1,23 @@ dnl Autoconf settings for vlc +AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team]) + AC_INIT(vlc, 1.0.0-git) VERSION_MAJOR="1" VERSION_MINOR="0" VERSION_REVISION="0" VERSION_EXTRA="-git" +PKGDIR="vlc" +AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Goldeneye" -COPYRIGHT_YEARS="1996-2008" +COPYRIGHT_YEARS="1996-2009" AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) +AC_CONFIG_MACRO_DIR(m4) AC_CANONICAL_BUILD AC_CANONICAL_HOST @@ -29,6 +34,16 @@ AS_IF([test "x${enable_maintainer_mode}" != "xno"], [enable_maintainer_mode="yes"]) AM_MAINTAINER_MODE +dnl +dnl Directories +dnl +dnl vlcincludedir="\${includedir}/\${PKGDIR}" +dnl AC_SUBST(vlcincludedir) +vlcdatadir="\${datadir}/\${PKGDIR}" +AC_SUBST(vlcdatadir) +vlclibdir="\${libdir}/\${PKGDIR}" +AC_SUBST(vlclibdir) + dnl dnl Deprecated options dnl to notify packagers that stuff has changed @@ -326,7 +341,7 @@ 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 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],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv @@ -499,6 +514,9 @@ AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) AC_FUNC_ALLOCA AC_CHECK_FUNCS(fcntl) +dnl Check for Linux system calls +AC_CHECK_FUNCS([vmsplice eventfd]) + AH_BOTTOM([#include ]) AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])]) @@ -791,7 +809,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h) -AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h]) +AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ #include @@ -1176,6 +1194,28 @@ if test "${SYS}" != "mingwce"; then ALIASES="${ALIASES} rvlc" fi +if test "${SYS}" = "mingwce"; then + VLC_ADD_PLUGIN([chain]) + VLC_ADD_PLUGIN([aout_file]) + VLC_ADD_PLUGIN([linear_resampler]) + VLC_ADD_PLUGIN([bandlimited_resampler]) + VLC_ADD_PLUGIN([float32_mixer]) + VLC_ADD_PLUGIN([spdif_mixer]) + VLC_ADD_PLUGIN([simple_channel_mixer]) + VLC_ADD_PLUGIN([headphone_channel_mixer]) + VLC_ADD_PLUGIN([normvol]) + VLC_ADD_PLUGIN([converter_float]) + VLC_ADD_PLUGIN([a52tospdif]) + VLC_ADD_PLUGIN([dtstospdif]) + VLC_ADD_PLUGIN([audio_format]) + VLC_ADD_PLUGIN([i420_yuy2]) + VLC_ADD_PLUGIN([i422_yuy2]) + VLC_ADD_PLUGIN([i420_ymga]) + VLC_ADD_PLUGIN([i422_i420]) + VLC_ADD_PLUGIN([yuy2_i422]) + VLC_ADD_PLUGIN([yuy2_i420]) +fi + dnl dnl Some plugins aren't useful on some platforms dnl @@ -1190,6 +1230,7 @@ elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([dmo]) VLC_ADD_PLUGIN([msn]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) + VLC_ADD_PLUGIN([globalhotkeys]) else VLC_ADD_PLUGIN([win32text]) fi @@ -2343,23 +2384,6 @@ then VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) fi - if test "${enable_alsa}" != "no" - then - AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false") - fi - - if test "${have_v4l2_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_LDFLAGS([v4l2],[-lasound -lm -ldl]) - AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.) - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ VLC_ADD_PLUGIN([v4l2]) @@ -2927,8 +2951,8 @@ dnl dnl libid3tag support (FIXME!!! doesn't work with new input) dnl AC_ARG_ENABLE( id3tag, -[ --disable-id3tag id3tag metadata reader plugin (default enabled)]) -AS_IF([test "${enable_id3tag}" != "no"], [ +[ --disable-id3tag id3tag metadata reader plugin (default disabled)]) +AS_IF([test "${enable_id3tag}" = "yes"], [ AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ VLC_ADD_LIBS([id3tag],[-lid3tag -lz]) @@ -3215,11 +3239,18 @@ dnl MP4 module dnl AC_CHECK_HEADERS(zlib.h, [ VLC_ADD_LIBS([mp4 skins2 sap mkv gme],[-lz]) + VLC_ADD_CPPFLAGS([skins2],[-I../../../@top_srcdir@/libs/unzip]) + VLC_ADD_LIBS([skins2],[../../../libs/unzip/libunzip.la]) ] ) -AC_CHECK_HEADERS(sysfs/libsysfs.h, [ - VLC_ADD_LIBS([mp4 mkv],[-lsysfs]) -] ) +AC_ARG_ENABLE(libsysfs, + [ --enable-libsysfs Get user key from firewire connected iPod via libsysfs (default enabled)]) + +AS_IF([test "${enable_libsysfs}" != "no"],[ + AC_CHECK_HEADERS(sysfs/libsysfs.h, [ + VLC_ADD_LIBS([mp4 mkv],[-lsysfs]) + ] ) +]) dnl dnl skins2 module @@ -3836,6 +3867,23 @@ 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.]) + ]) + ]) +]) + + dnl dnl Video plugins dnl @@ -3874,6 +3922,9 @@ if test "${enable_x11}" != "no" && VLC_ADD_PLUGIN([panoramix]) VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) + VLC_ADD_PLUGIN([globalhotkeys]) + VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}]) AC_CHECK_LIB(Xext, XShmAttach, [ VLC_ADD_PLUGIN([x11]) VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) @@ -4370,6 +4421,20 @@ AC_ARG_ENABLE(mga, VLC_ADD_PLUGIN([mga]) fi ]) +dnl +dnl OMAP Framebuffer module +dnl +AC_ARG_ENABLE(omapfb, + [ --enable-omapfb OMAP framebuffer support (default disabled)]) + if test "${enable_omapfb}" = "yes" + then + AC_CHECK_HEADERS(asm/arch-omap/omapfb.h, [ + VLC_ADD_PLUGIN([omapfb]) + AC_CHECK_HEADERS(X11/Xlib.h, [ + VLC_ADD_LIBS([omapfb],[${X_LIBS} ${X_PRE_LIBS} -lX11]) ]) + ]) + fi + dnl dnl SVGAlib module dnl @@ -4531,6 +4596,8 @@ if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGIN([wingdi]) VLC_ADD_PLUGIN([wingapi]) + VLC_ADD_LIBS([wingdi],[-laygshell]) + VLC_ADD_LIBS([wingapi],[-laygshell]) fi fi @@ -4552,6 +4619,7 @@ if test "${enable_oss}" != "no" && then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ VLC_ADD_PLUGIN([oss]) + VLC_ADD_PLUGIN([access_oss]) AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) ]) fi @@ -4604,6 +4672,8 @@ then 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]) @@ -4848,6 +4918,29 @@ then fi AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"]) +dnl +dnl Maemo +dnl +AC_ARG_ENABLE(maemo, + [ --enable-maemo Internet tablets based on Maemo SDK (default disabled)]) +if test "${enable_maemo}" = "yes" +then + PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [ + VLC_ADD_CFLAGS([maemo],[${HILDON_CFLAGS}]) + VLC_ADD_LIBS([maemo],[${HILDON_LIBS}]) + VLC_ADD_PLUGIN([maemo]) + VLC_ADD_PLUGIN([swscale_maemo]) + AC_DEFINE([BUILD_MAEMO], 1, [Define if you're using Maemo interfaces]) + ALIASES="${ALIASES} mvlc" + ], [ + AS_IF([test "${enable_maemo}" = "yes"],[ + AC_MSG_ERROR([Hildon libraries not found]) + ]) + enable_maemo="no" + ]) +fi +AM_CONDITIONAL(BUILD_MAEMO, [test "${enable_maemo}" = "yes"]) + dnl dnl QT 4 dnl @@ -4856,7 +4949,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.2.0], [ + PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.3.0], [ VLC_ADD_PLUGIN([qt4]) AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) ALIASES="${ALIASES} qvlc" @@ -5200,7 +5293,7 @@ dnl dnl libgcrypt dnl AC_ARG_ENABLE(libgcrypt, - [ --enable-libgcrypt libgcrypts support (default enabled)]) + [ --disable-libgcrypt libgcrypts support (default enabled)]) AS_IF([test "${enable_libgcrypt}" != "no"], [ AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) ]) @@ -5257,6 +5350,21 @@ AS_IF([test "${enable_remoteosd}" != "no"], [ ]) +dnl +dnl RAOP plugin +dnl +AC_MSG_CHECKING([whether to enable RAOP plugin]) +AS_IF([test "${have_libgcrypt}" = "yes"], [ + AC_MSG_RESULT(yes) + VLC_ADD_PLUGIN([stream_out_raop]) + VLC_ADD_LIBS([stream_out_raop], [${LIBGCRYPT_LIBS}]) + VLC_ADD_CFLAGS([stream_out_raop], [${LIBGCRYPT_CFLAGS}]) +], [ + AC_MSG_RESULT(no) + AC_MSG_WARN([libgcrypt support required for RAOP plugin]) +]) + + dnl dnl update checking system dnl @@ -5273,6 +5381,22 @@ then AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism]) fi + +dnl +dnl ZIP files demuxer +dnl +AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) +AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) +if test "${have_zlib}" = "yes" +then + VLC_ADD_PLUGIN([unzip]) + VLC_ADD_LIBS([zip],[-lz]) + VLC_ADD_PLUGIN([zip]) + VLC_ADD_CFLAGS([zip],[-I../../../@top_srcdir@/libs/unzip]) + VLC_ADD_LIBS([zip],[../../../libs/unzip/libunzip.la]) +fi + + dnl dnl Endianness check dnl @@ -5536,8 +5660,8 @@ 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],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) - VLC_ADD_LIBS([x11 xvideo xvmc glx],[-losso]) + VLC_ADD_CPPFLAGS([x11 xvideo xvmc glx omapfb],[-DHAVE_OSSO ${DBUS_CFLAGS} ${GLIB2_CFLAGS}]) + VLC_ADD_LIBS([x11 xvideo xvmc glx omapfb],[-losso]) ]) ]) AC_CHECK_LIB(Xsp, XSPSetPixelDoubling,[ @@ -5737,6 +5861,7 @@ AC_CONFIG_FILES([ extras/package/ipkg/Makefile libs/loader/Makefile libs/srtp/Makefile + libs/unzip/Makefile modules/Makefile projects/mozilla/Makefile m4/Makefile @@ -5754,6 +5879,7 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([ modules/access/Makefile + modules/access/bd/Makefile modules/access/bda/Makefile modules/access/dshow/Makefile modules/access/dvb/Makefile @@ -5762,11 +5888,10 @@ AC_CONFIG_FILES([ modules/access/rtp/Makefile modules/access/rtsp/Makefile modules/access/rtmp/Makefile - modules/access/v4l2/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile modules/access/screen/Makefile - modules/access_filter/Makefile + modules/access/zip/Makefile modules/access_output/Makefile modules/audio_filter/Makefile modules/audio_filter/channel_mixer/Makefile @@ -5784,6 +5909,7 @@ AC_CONFIG_FILES([ modules/codec/xvmc/Makefile modules/control/Makefile modules/control/http/Makefile + modules/control/globalhotkeys/Makefile modules/demux/Makefile modules/demux/asf/Makefile modules/demux/avformat/Makefile @@ -5796,6 +5922,7 @@ AC_CONFIG_FILES([ modules/gui/beos/Makefile modules/gui/pda/Makefile modules/gui/macosx/Makefile + modules/gui/maemo/Makefile modules/gui/minimal_macosx/Makefile modules/gui/qnx/Makefile modules/gui/qt4/Makefile @@ -5817,6 +5944,7 @@ AC_CONFIG_FILES([ modules/mux/mpeg/Makefile modules/packetizer/Makefile modules/services_discovery/Makefile + modules/stream_filter/Makefile modules/stream_out/Makefile modules/stream_out/transrate/Makefile modules/video_chroma/Makefile