X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=e9deddce72fb90ea60f955c27547343bb92a11b2;hb=6b7540a5c18cdf46db2e21f4198ab2d2d14677e9;hp=5bcacb1bdbfa1bcceec45557c530cd608b582cfc;hpb=d9421a57fca120c70c5980d5f4e69e9fa2c7324b;p=vlc diff --git a/configure.ac b/configure.ac index 5bcacb1bdb..e9deddce72 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf settings for vlc -AC_INIT(vlc,0.9.0-git) +AC_INIT(vlc, 0.9.0-test1) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" @@ -1133,6 +1133,7 @@ VLC_ADD_PLUGIN([extract]) VLC_ADD_PLUGIN([sharpen]) VLC_ADD_PLUGIN([seamcarving]) VLC_ADD_PLUGIN([croppadd]) +VLC_ADD_PLUGIN([canvas]) VLC_ADD_PLUGIN([blendbench]) VLC_ADD_PLUGIN([blend]) VLC_ADD_PLUGIN([scale]) @@ -1215,6 +1216,7 @@ if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([normvol]) VLC_ADD_PLUGIN([equalizer]) VLC_ADD_PLUGIN([param_eq]) + VLC_ADD_PLUGIN([scaletempo]) VLC_ADD_PLUGIN([converter_float]) VLC_ADD_PLUGIN([a52tospdif]) VLC_ADD_PLUGIN([dtstospdif]) @@ -1254,7 +1256,7 @@ dnl Check for fully working MMX intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(mmx, -[ --disable-mmx disable MMX optimizations (default auto)],,[ +[ --disable-mmx disable MMX optimizations (default auto)],,[ case "${host_cpu}" in i?86|x86_64) enable_mmx="yes" @@ -1321,7 +1323,8 @@ dnl Check for fully workin SSE2 intrinsics dnl We need support for -mmmx, we need , and we also need a dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963) AC_ARG_ENABLE(sse, -[ --disable-sse disable SSE (1 and 2) optimizations (default auto)],, [ +[ --disable-sse disable SSE (1 and 2) optimizations (default auto)] +,, [ case "${host_cpu}" in i686|x86_64) enable_sse=yes @@ -1664,6 +1667,21 @@ then fi 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"], [ + AC_CHECK_HEADERS(proxy.h, [ + VLC_ADD_LIBS([access_http],[-lproxy]) + ], [ + AS_IF([test "x${enable_libproxy}" != "x"], [ + AC_MSG_ERROR([libproxy could not be found on your system]) + ]) + ]) +]) + dnl dnl VideoLAN manager dnl @@ -2028,11 +2046,16 @@ then [ VLC_ADD_PLUGIN([dvdread]) VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) ],[ - if test -n "${enable_dvdread}" - then - AC_MSG_ERROR([cannot find libdvdread headers]) - fi - ]) + AC_CHECK_HEADERS(libdvdread/dvd_reader.h, + [ VLC_ADD_PLUGIN([dvdread]) + VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) + ],[ + if test -n "${enable_dvdread}" + then + AC_MSG_ERROR([cannot find libdvdread headers]) + fi + ]) + ]) else AC_MSG_CHECKING(for libdvdread.a in ${with_dvdread_tree}) real_dvdread_tree="`cd ${with_dvdread_tree} 2>/dev/null && pwd`" @@ -2887,7 +2910,7 @@ dnl dnl libid3tag support (FIXME!!! doesn't work with new input) dnl AC_ARG_ENABLE( id3tag, - [ --disable-id3tag id3tag metadata reader plugin (default enabled)]) +[ --disable-id3tag id3tag metadata reader plugin (default enabled)]) AS_IF([test "${enable_id3tag}" != "no"], [ AC_CHECK_HEADERS(id3tag.h, [ AC_CHECK_HEADERS(zlib.h, [ @@ -2902,7 +2925,7 @@ dnl avcodec decoder/encoder plugin dnl AC_ARG_ENABLE(avcodec, -[ --enable-avcodec libavcodec codec (default enabled)]) +[ --enable-avcodec libavcodec codec (default enabled)]) if test "${enable_avcodec}" != "no" then PKG_CHECK_MODULES(AVCODEC,[libavcodec libavutil], @@ -2926,7 +2949,7 @@ dnl avformat demuxer/muxer plugin dnl AC_ARG_ENABLE(avformat, -[ --enable-avformat libavformat containers (default enabled)]) +[ --enable-avformat libavformat containers (default enabled)]) if test "${enable_avformat}" != "no" then PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil], @@ -2950,7 +2973,7 @@ dnl swscale image scaling and conversion plugin dnl AC_ARG_ENABLE(swscale, -[ --enable-swscale libswscale image scaling and conversion (default enabled)]) +[ --enable-swscale libswscale image scaling and conversion (default enabled)]) if test "${enable_swscale}" != "no" then PKG_CHECK_MODULES(SWSCALE,[libswscale], @@ -2978,7 +3001,7 @@ dnl from VLC. dnl AC_ARG_ENABLE(imgresample, -[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) +[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) if test "${enable_imgresample}" = "yes" then PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec], @@ -3014,7 +3037,7 @@ dnl postproc plugin dnl AC_ARG_ENABLE(postproc, -[ --enable-postproc libpostproc image post-processing (default enabled)]) +[ --enable-postproc libpostproc image post-processing (default enabled)]) if test "${enable_postproc}" != "no" then PKG_CHECK_MODULES(POSTPROC,[libpostproc libavutil], @@ -3555,11 +3578,11 @@ dnl AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then - PKG_CHECK_MODULES(DIRAC,[dirac >= 0.9.0], [ + 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 doesn't appear to be installed on you system.]) + AC_MSG_ERROR([libdirac >= 0.10.0 doesn't appear to be installed on your system.]) ]) fi @@ -3686,7 +3709,7 @@ dnl dnl asa/csri subtitle rendering module dnl AC_ARG_ENABLE(csri, - [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) + [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) AS_IF( [test "${enable_csri}" = "yes"], [ PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, @@ -3703,7 +3726,7 @@ dnl dnl asa demuxer dnl AC_ARG_ENABLE(asademux, - [ --enable-asademux asa subtitle demuxing (default disabled)]) + [ --enable-asademux asa subtitle demuxing (default disabled)]) AS_IF( [test "${enable_asademux}" = "yes"], [ PKG_CHECK_MODULES(PCRE, libpcre >= 6.5, @@ -4395,33 +4418,6 @@ then fi ]) fi -dnl -dnl Glide module -dnl -AC_ARG_ENABLE(glide, - [ --enable-glide Glide (3dfx) support (default disabled)]) -if test "${enable_glide}" = "yes" -then - CFLAGS_save="${CFLAGS}" - AC_ARG_WITH(glide, - [ --with-glide=PATH path to libglide], - [ if test "${with_glide}" != "no" -a -n "${with_glide}" - then - VLC_ADD_CPPFLAGS([glide],[-I${with_glide}/include]) - VLC_ADD_LIBS([glide],[-L${with_glide}/lib]) - CFLAGS="$CFLAGS -I${with_glide}/include" - fi ]) - CFLAGS="$CFLAGS -I/usr/include/glide" - AC_CHECK_HEADER(glide.h,[ - VLC_ADD_PLUGIN([glide]) - VLC_ADD_LIBS([glide],[-lglide2x -lm]) - VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) - ],[ - AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide]) - ]) - CFLAGS="${CFLAGS_save}" -fi - dnl dnl AA plugin dnl @@ -4729,7 +4725,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [ --enable-upnp Intel UPnP SDK (default enabled)]) + [AS_HELP_STRING([--enable-upnp],[Intel UPnP SDK (default enabled)])]) VLC_ADD_CXXFLAGS([upnp_intel], [ ]) AS_IF([test "x${enable_upnp}" != "xno"], [ @@ -4765,7 +4761,8 @@ dnl dnl Skins2 module dnl AC_ARG_ENABLE(skins2, - [ --enable-skins2 Skins2 interface module (default disabled)]) + [AS_HELP_STRING([--enable-skins2],[Skins2 interface module (default + enabled except on MacOSX, BeOS and WinCE)])]) if test "${enable_skins2}" = "yes" || (test "${SYS}" != "darwin" && test "${SYS}" != "beos" && test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no"); then @@ -4803,7 +4800,9 @@ if test "${enable_skins2}" = "yes" || VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11]) fi fi fi fi -AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"]) +AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes" || + (test "${SYS}" != "darwin" && test "${SYS}" != "beos" && + test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")]) dnl dnl PDA Gtk+2 module @@ -5127,7 +5126,7 @@ dnl AtmoLight (homebrew AmbiLight) dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then AC_ARG_ENABLE(atmo, -[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) +[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)]) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) @@ -5180,7 +5179,7 @@ AS_IF([test "${enable_libgcrypt}" != "no"], [ ]) if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"; then AS_IF([test "${have_libgcrypt}" = "yes"],[ - VLC_ADD_LIBS([rtp], [${LIBGCRYPT_LIBS}]) + VLC_ADD_LIBS([rtp stream_out_rtp], [${LIBGCRYPT_LIBS}]) ]) fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) @@ -5218,7 +5217,7 @@ dnl dnl RemoteOSD plugin (VNC client as video filter) dnl AC_ARG_ENABLE(remoteosd, - [ --disable-remoteosd RemoteOSD plugin (default enabled)]) + [ --disable-remoteosd RemoteOSD plugin (default enabled)]) AS_IF([test "${enable_remoteosd}" != "no"], [ AS_IF([test "${have_libgcrypt}" = "yes"],[ @@ -5315,13 +5314,13 @@ then AC_CHECK_HEADERS(objsafe.h, VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, [ - #if HAVE_OLE2_H + #if HAVE_OLE2_H # include #endif - ] + ] ) activex=: - PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex" + PLUGINS_BINDINGS="${PLUGINS_BINDINGS} activex" ], [ AC_MSG_ERROR([required OLE headers are missing from your system]) ] )], @@ -5404,24 +5403,70 @@ then CPPFLAGS="${CPPFLAGS_save}" ], [ - AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) - if test "${MOZILLA_CONFIG}" = "no" - then - AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no) - if test "${SEAMONKEY_CONFIG}" = "no" - then - AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no) - if test "${XULRUNNER_CONFIG}" = "no" + PKG_CHECK_MODULES([XULRUNNER], [libxul], + [ + PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom], + [], + [ + PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr], + [], + [ + PKG_CHECK_MODULES([NSPR], [nspr], + [], + [ + AC_MSG_ERROR([Please install the nspr development tools.]) + ] + ) + ] + ) + ] + ) + CPPFLAGS="${CPPFLAGS_save} ${XULRUNNER_CFLAGS} ${XULRUNNER_CPPFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}" + MOZILLA_REQUIRED_HEADERS=1 + AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) + AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, + [#if HAVE_NPAPI_H + # include + #endif + ]) + if test "${MOZILLA_REQUIRED_HEADERS}" = "0"; then + AC_MSG_ERROR([Please install the Mozilla runtime package xulrunner-devel; plugplugin/npapi.h and plugin/npruntime.h were not found.]) + fi + MOZILLA_REQUIRED_HEADERS= + mozilla=: + AC_DEFINE([XP_UNIX],[1],[Defined for Mozilla as we are Unix]) + AC_DEFINE([MOZ_X11],[1],[Defined as Unix mozilla uses X11]) + AC_DEFINE([OJI],[1],[Java Runtime Interface]) + AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h])) + VLC_ADD_LIBS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt -lXpm]) + VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}]) + VLC_ADD_LDFLAGS([mozilla],[${MOZILLA_LDFLAGS}]) + VLC_ADD_LIBS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS}]) + VLC_ADD_PLUGIN([mozilla]) + MOZILLA_CONFIG= + CPPFLAGS="${CPPFLAGS_save}" + ], + [ + AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) + if test "${MOZILLA_CONFIG}" = "no" then - AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) - else - have_xul=true - MOZILLA_CONFIG="${XULRUNNER_CONFIG}" + AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no) + if test "${SEAMONKEY_CONFIG}" = "no" + then + AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no) + if test "${XULRUNNER_CONFIG}" = "no" + then + AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) + else + have_xul=true + MOZILLA_CONFIG="${XULRUNNER_CONFIG}" + fi + else + MOZILLA_CONFIG="${SEAMONKEY_CONFIG}" + fi fi - else - MOZILLA_CONFIG="${SEAMONKEY_CONFIG}" - fi - fi + ] + ) ] ) if test ! -z "${MOZILLA_CONFIG}" @@ -5550,16 +5595,6 @@ then VLC_ADD_PLUGIN([test4]) fi -dnl -dnl Microsoft Layer for Unicode for WIN9x/ME -dnl -if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" -then - AC_CHECK_LIB(unicows, LoadUnicowsSymbol, [ - VLC_ADD_LDFLAGS([vlc libvlc],[-Wl,--exclude-libs,libunicows.a -lunicows]) - ]) -fi - dnl dnl gtk_main plugin dnl