X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=59c7577b1ed4e68797b26a5192fd796bbdc6082b;hb=dda858d436bceafa45b834836a6dd302ad7da181;hp=b3dfc7caeab01d3ea2c341fa91cf2c5b061b085e;hpb=e5ed4c8e9f4f1851b966742f2dc535df8aa676cb;p=vlc diff --git a/configure.ac b/configure.ac index b3dfc7caea..59c7577b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ AC_ARG_WITH(contrib, if test "`echo \"$topdir\" | cut -c 1`" != "/"; then topdir="`pwd`/$topdir" fi - if test "`grep HOST ${topdir}/extras/contrib/config.mak |awk '{print $3}'`" != "`$CC -dumpmachine`"; then + if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then if test "${with_contrib}" = "yes"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host]) @@ -564,7 +564,7 @@ AM_CONDITIONAL(BUILD_GETOPT, ${need_getopt}) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_TYPE_SIGNAL AC_CHECK_LIB(m,cos,[ - VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom],[-lm]) + VLC_ADD_LDFLAGS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual],[-lm]) ]) AC_CHECK_LIB(m,pow,[ VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer param_eq vlc freetype mpc dmo quicktime realaudio galaktos],[-lm]) @@ -823,9 +823,9 @@ then PKG_CHECK_MODULES(HAL, hal >= 0.5.0, [ AC_DEFINE( HAVE_HAL_1, [] , [Define if you have the new HAL library API]) AC_DEFINE( HAVE_HAL, [], [Define if you have the HAL library] ) - VLC_ADD_PLUGINS([hal]) - VLC_ADD_LDFLAGS([vlc hal],[$HAL_LIBS]) - VLC_ADD_CFLAGS([vlc hal],[$HAL_CFLAGS])], + VLC_ADD_PLUGINS([hal probe_hal]) + VLC_ADD_LDFLAGS([vlc hal probe_hal],[$HAL_LIBS]) + VLC_ADD_CFLAGS([vlc hal probe_hal],[$HAL_CFLAGS])], dnl No hal 0.5 Test for 0.2 [ PKG_CHECK_MODULES( HAL, hal >= 0.2.97, [AC_DEFINE(HAVE_HAL, [], [Define if you have the HAL library]) @@ -1122,7 +1122,7 @@ dnl VLC_ADD_PLUGINS([dummy logger memcpy]) VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac]) VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec]) -VLC_ADD_PLUGINS([deinterlace invert adjust transform distort motionblur rv32]) +VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32]) VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) @@ -1137,7 +1137,7 @@ VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) if test "${SYS}" != "mingwce"; then dnl VLC_ADD_PLUGINS([externrun]) VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record]) - VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake]) + VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake motion]) VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop]) VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) @@ -2729,7 +2729,7 @@ dnl Trying with pkg-config AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) - AC_CHECK_LIB(avutil, av_add_i, [ + AC_CHECK_LIB(avutil, av_crc_init, [ VLC_ADD_LDFLAGS([ffmpeg],[-lavutil]) LDAVUTIL="-lavutil"]) @@ -3799,7 +3799,7 @@ AC_ARG_ENABLE(svg, if test "${enable_svg}" = "yes" then PKG_CHECK_MODULES(SVG, - librsvg-2.0 >= 2.5.0, + librsvg-2.0 >= 2.9.0, [ VLC_ADD_LDFLAGS([svg],[$SVG_LIBS]) VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) @@ -3908,11 +3908,15 @@ then AC_CHECK_HEADERS(ddraw.h, [ VLC_ADD_PLUGINS([vout_directx aout_directx]) VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) - dnl to be moved when dependance is removed - AC_CHECK_HEADERS(GL/gl.h, [ - VLC_ADD_PLUGINS([glwin32]) - VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32]) - ]) ]) + ]) + AC_CHECK_HEADERS(GL/gl.h, + [ VLC_ADD_PLUGINS([glwin32]) + VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32]) + ]) + AC_CHECK_HEADERS(d3d9.h, + [ VLC_ADD_PLUGINS([direct3d]) + VLC_ADD_LDFLAGS([direct3d],[-ld3d9 -lgdi32]) + ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) if test -f ${with_directx}/ddraw.h @@ -4632,10 +4636,12 @@ AC_ARG_ENABLE(qt4, [if test "${enable_qt4}" = "yes"; then PKG_CHECK_MODULES(QT4, QtCore QtGui, [ VLC_ADD_PLUGINS([qt4]) - enableqt4=true + ALIASES="${ALIASES} qvlc" + enableqt4=true VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS]) VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS]) MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc + RCC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/rcc UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic], [AC_MSG_WARN(QT4 library not found)]) fi]) @@ -4994,6 +5000,10 @@ AS_IF([test "${enable_gnutls}" != "no"], [ ]) gnutls_LIBS="-lgcrypt -lz ${gcrypt_LIBS}" + AS_IF([test "${SYS}" = "darwin"], [ + gnutls_LIBS="-lintl ${gnutls_LIBS}" + VLC_ADD_LDFLAGS([gnutls],[-lintl]) + ]) AC_CHECK_HEADER(gcrypt.h, [ AC_CHECK_LIB(gcrypt, gcry_control, [ @@ -5150,20 +5160,20 @@ then MOZILLA_CONFIG="${XULRUNNER_CONFIG}" fi fi - + if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}" AC_CHECK_LIB(Xt,XtStrings, [ - VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}] + VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]) VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE]) - ], +], [], [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE] ]) LDFLAGS="${LDFLAGS_save}" fi - + mozilla=: dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490 VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]]) @@ -5246,9 +5256,10 @@ dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) -if test "${enable-java-bindings}" = "yes" +if test "${enable_java_bindings}" = "yes" then - AC_PROG_JAVA_CC(javac) + AS_IF([test "x${JAVA_HOME}" == "x"], + [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])]) AC_PROG_JAVAC AC_PROG_JAVA fi @@ -5385,6 +5396,19 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.]) FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], FILE_LIBVLC_DLL="" ) +dnl +dnl we need pic on amd64 fo the mozilla plugin + +case "${target_cpu}" in + x86_64) + pic=pic + ;; + *) + pic="" + ;; +esac +AC_SUBST(pic) + dnl Import conditional variables generated by bootstrap VLC_CONDITIONALS @@ -5413,7 +5437,7 @@ dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for modu dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions]) dnl New definitions with value matching 0.8.6 release -module_symbol="0_8_6" +module_symbol="0_8_6a" AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions]) AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions]) VLC_ENTRY="vlc_entry__${module_symbol}" @@ -5445,6 +5469,7 @@ AC_SUBST(ARCH) AC_SUBST(ALIASES) AC_SUBST(ASM) AC_SUBST(MOC) +AC_SUBST(RCC) AC_SUBST(UIC) AC_SUBST(WINDRES) AC_SUBST(MOZILLA_SDK_PATH) @@ -5469,6 +5494,7 @@ AC_CONFIG_FILES([ activex/axvlc.inf bindings/Makefile bindings/java/Makefile + bindings/java/src/Makefile bindings/mediacontrol-python/Makefile doc/Makefile intl/Makefile @@ -5487,8 +5513,6 @@ AC_CONFIG_FILES([ modules/access/dshow/Makefile modules/access/dvb/Makefile modules/access/mms/Makefile - modules/access/pvr/Makefile - modules/access/v4l/Makefile modules/access/cdda/Makefile modules/access/rtsp/Makefile modules/access/vcd/Makefile @@ -5533,6 +5557,7 @@ AC_CONFIG_FILES([ modules/misc/testsuite/Makefile modules/misc/playlist/Makefile modules/misc/xml/Makefile + modules/misc/probe/Makefile modules/mux/Makefile modules/mux/mpeg/Makefile modules/mux/rtp/Makefile