X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=eca81c778660b3ac455b125ca141ebc1fd5b61c1;hb=95c51011d5b6c8dbe2f22afc781822dda55ff92e;hp=7aecb5a65bdb1486ecfb4c456c005248f36775d1;hpb=d408d54f23107e7e2eb1274c910c0e56977ef6fd;p=vlc diff --git a/configure.ac b/configure.ac index 7aecb5a65b..eca81c7786 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-test2) VERSION_MAJOR="0" VERSION_MINOR="9" VERSION_REVISION="0" @@ -57,7 +57,7 @@ dnl Check for tools dnl AC_PROG_CC_C99 AC_USE_SYSTEM_EXTENSIONS -AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to `2' to get glibc warnings.]) +AC_DEFINE([_FORTIFY_SOURCE], 2, [Define to '2' to get glibc warnings.]) AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_CPP @@ -80,6 +80,17 @@ AC_C_CONST AC_C_INLINE AC_C_RESTRICT +dnl Allow binary package maintainer to pass a custom string to avoid +dnl cache problem +AC_ARG_WITH(binary-version, + AS_HELP_STRING([--with-binary-version=STRING], + [To avoid plugins cache problem between binary version]),[],[]) +AS_IF([test -n "${with_binary_version}"],[ + AC_DEFINE_UNQUOTED([DISTRO_VERSION],["${with_binary_version}"], + [Binary specific version]) + ]) + + dnl dnl Check for the contrib directory dnl @@ -197,7 +208,8 @@ case "${host_os}" in VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) AC_ARG_ENABLE(macosx-defaults, - [ --enable-macosx-defaults Build the default configuration on Mac OS X (default enabled)]) + AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration + on Mac OS X (default enabled)])) if test "x${enable_macosx_defaults}" != "xno" then echo "" @@ -419,8 +431,6 @@ dnl dnl Iconv stuff dnl AM_ICONV -AS_IF([test "$am_cv_func_iconv" != "yes"], - [AC_MSG_ERROR([libiconv is needed for VLC to work properly])]) VLC_ADD_CFLAGS([libvlc],[${INCICONV}]) VLC_ADD_LIBS([libvlc],[${LTLIBICONV}]) @@ -894,7 +904,8 @@ then VLC_ADD_CFLAGS([dbus],[$DBUS_CFLAGS]) fi dnl Check for Telepathy - AC_ARG_ENABLE(telepathy, [ --enable-telepathy Telepathy Presence plugin through DBus(default enabled)]) + AC_ARG_ENABLE(telepathy, + AS_HELP_STRING([--enable-telepathy],[Telepathy Presence plugin through DBus(default enabled)])) if test "${enable_telepathy}" != "no"; then VLC_ADD_PLUGIN([telepathy]) VLC_ADD_LIBS([telepathy],[$DBUS_LIBS]) @@ -1133,6 +1144,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]) @@ -1203,7 +1215,7 @@ if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([i422_i420]) VLC_ADD_PLUGIN([yuy2_i422]) VLC_ADD_PLUGIN([yuy2_i420]) - VLC_ADD_PLUGIN([chroma_chain]) + VLC_ADD_PLUGIN([chain]) VLC_ADD_PLUGIN([aout_file]) VLC_ADD_PLUGIN([linear_resampler]) VLC_ADD_PLUGIN([bandlimited_resampler]) @@ -1215,6 +1227,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]) @@ -1618,7 +1631,8 @@ fi dnl Lua modules AC_ARG_ENABLE(lua, - [ --enable-lua lua playlist, metafetcher and interface plugins (default enabled)]) + AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface + plugins (default enabled)])) if test "${enable_lua}" != "no" then PKG_CHECK_MODULES(LUA, lua5.1, @@ -1693,6 +1707,7 @@ AS_IF([test "${enable_vlm}" != "no"], [ AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support]) VLC_ADD_PLUGIN([telnet]) ]) +AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"]) dnl dnl Growl notification plugin @@ -2044,11 +2059,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`" @@ -2138,7 +2158,8 @@ dnl dnl Windows DirectShow BDA access module dnl AC_ARG_ENABLE(bda, - [ --enable-bda Win32 DirectShow BDA support (default enabled on Win32)]) + AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default + enabled on Win32)])) if test "${enable_bda}" != "no" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" @@ -2438,7 +2459,8 @@ dnl dnl VCDX and CDDAX modules dnl AC_ARG_ENABLE(cddax, - [ --enable-cddax audio CD plugin with CD Text and CD paranoia via libcdio (default disabled)]) + AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia + via libcdio (default disabled)])) AC_ARG_ENABLE(libcddb, [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) @@ -2966,7 +2988,8 @@ dnl swscale image scaling and conversion plugin dnl AC_ARG_ENABLE(swscale, -[ --enable-swscale libswscale image scaling and conversion (default enabled)]) + AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion + (default enabled)])) if test "${enable_swscale}" != "no" then PKG_CHECK_MODULES(SWSCALE,[libswscale], @@ -2994,7 +3017,8 @@ dnl from VLC. dnl AC_ARG_ENABLE(imgresample, -[ --enable-imgresample deprecated libavcodec image scaling and conversion (default disabled)]) + AS_HELP_STRING([--enable-imgresample],[deprecated libavcodec image scaling + and conversion (default disabled)])) if test "${enable_imgresample}" = "yes" then PKG_CHECK_MODULES(IMGRESAMPLE,[libavcodec], @@ -3290,7 +3314,8 @@ AS_IF([test "x${with_dts_tree}" != "x"], [ ]) AC_ARG_ENABLE(dca, - [ --enable-dca DTS Coherent Acoustics support with libdca (default enabled)]) + 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],, @@ -3571,14 +3596,30 @@ 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 +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], [ + 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 + dnl dnl PNG decoder module dnl @@ -3673,9 +3714,11 @@ dnl telx module dnl uncompatible dnl AC_ARG_ENABLE(zvbi, - [ --enable-zvbi VBI (inc. Teletext) decoding support with libzvbi (default enabled)]) + AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with + libzvbi (default enabled)])) AC_ARG_ENABLE(telx, - [ --enable-telx Teletext decoding module (conflicting with zvbi) (default disabled)]) + AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with + zvbi) (default disabled)])) AS_IF( [test "${enable_zvbi}" != "no"],[ AS_IF( [test "${enable_telx}" = "yes"],[ @@ -3726,6 +3769,9 @@ 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]) + fi VLC_ADD_PLUGIN([asademux]) ],[ AC_MSG_WARN([PCRE library not found (required for asademux)]) @@ -4411,33 +4457,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 @@ -4745,7 +4764,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [AS_HELP_STRING([--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"], [ @@ -4966,7 +4985,7 @@ then ORIGCFLAGS=$CFLAGS CFLAGS="$CFLAGS -x objective-c" - AC_CHECK_HEADER(QuartzCore/CALayer.h, + AC_TRY_COMPILE([#import ], [VLC_ADD_PLUGIN([opengllayer]) VLC_ADD_OBJCFLAGS([opengllayer], [-isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5])]) CFLAGS=$ORIGCFLAGS @@ -5146,7 +5165,8 @@ 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)]) +AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) + (default enabled)])) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) VLC_ADD_PLUGIN([atmo]) @@ -5199,7 +5219,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"]) @@ -5282,7 +5302,8 @@ dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?) dnl loader=false AC_ARG_ENABLE(loader, - [ --enable-loader build DLL loader for ELF i386 platforms (default disabled)]) + AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms + (default disabled)])) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], [ VLC_ADD_PLUGIN([dmo]) @@ -5310,7 +5331,8 @@ dnl Microsoft ActiveX support dnl activex=false AC_ARG_ENABLE(activex, - [ --enable-activex build a vlc-based ActiveX control (default enabled on Win32)]) + AS_HELP_STRING([--enable-activex],[build a vlc-based ActiveX control + (default enabled on Win32)])) AC_ARG_WITH(wine-sdk-path, [ --with-wine-sdk-path=PATH path to wine sdk]) if test "${enable_activex}" != "no" @@ -5360,7 +5382,8 @@ dnl Mozilla plugin dnl mozilla=false AC_ARG_ENABLE(mozilla, - [ --enable-mozilla build a vlc-based Firefox/Mozilla plugin (default disabled)]) + AS_HELP_STRING([--enable-mozilla],[build a vlc-based Firefox/Mozilla plugin + (default disabled)])) AC_ARG_WITH(mozilla-sdk-path, [ --with-mozilla-sdk-path=PATH path to mozilla sdk]) AC_LANG_PUSH(C++) @@ -5423,24 +5446,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}" @@ -5569,16 +5638,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 @@ -5686,7 +5745,7 @@ dnl Handle substvars that use $(top_srcdir) dnl VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" AC_SUBST(VLC_CONFIG) -CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include" +CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}" dnl dnl Restore *FLAGS