X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=0ae29b8c5d86b08fa0f123f880a87c518b7bca0e;hb=9aa773ce684884f04655dc433ea3e46e1eb55055;hp=c355f3d691d2ffad14ff773357a59921cbadd879;hpb=cc8fa0d27d07df4c9ccf75650994fa414daf50f8;p=vlc diff --git a/configure.ac b/configure.ac index c355f3d691..0ae29b8c5d 100644 --- a/configure.ac +++ b/configure.ac @@ -14,9 +14,7 @@ AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM -dnl XXX: we don't put any flags here, because automake 1.5 doesn't support -dnl them. And we need the comma otherwize automake will choke on it. -AM_INIT_AUTOMAKE(vlc,0.8.6-svn) +AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2]) AM_CONFIG_HEADER(config.h) dnl Too many people are not aware of maintainer mode: @@ -79,7 +77,7 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_ARG_ENABLE(libtool, - [ --enable-libtool use libtool (default disabled, EXPERIMENTAL)], + [ --enable-libtool use libtool (default disabled)], [],[enable_libtool="no"]) AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"]) @@ -98,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]) @@ -264,7 +262,9 @@ case "${target_os}" in VLC_ADD_CXXFLAGS([beos],[]) VLC_ADD_LDFLAGS([vlc logger],[-lbe]) VLC_ADD_LDFLAGS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame]) - + VLC_ADD_LDFLAGS([dvdnav dvdread],[-ldl]) + VLC_ADD_LDFLAGS([access_file],[-lpoll]) + LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${CFLAGS_save}" dnl Check for BONE if test -f /boot/beos/system/lib/libbind.so; then VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc growl],[-lbind -lsocket]) @@ -308,7 +308,7 @@ AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl) - INCLUDES="${INCLUDES} -I\$(top_builddir)/intl" + AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl" AS_IF([test "${enable_libtool}" != "no"], [ INCLUDED_LIBINTL="${LTLIBINTL}" ],[ @@ -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]) @@ -718,8 +718,13 @@ VLC_ADD_LDFLAGS([vlc plugin],[${THREAD_LIB}]) dnl Don't link with rt when using GNU-pth if test "${THREAD_LIB}" != "-lpth" && test "${THREAD_LIB}" != "-lst"; then - dnl HP/UX port - AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) + AC_CHECK_LIB(rt, clock_nanosleep, [ + VLC_ADD_LDFLAGS([vlc],[-lrt]) + AC_DEFINE(HAVE_CLOCK_NANOSLEEP, 1, [Define to 1 if you have clock_nanosleep.]) + ], [ + dnl HP/UX port + AC_CHECK_LIB(rt,sem_init, [VLC_ADD_LDFLAGS([vlc],[-lrt])]) + ]) have_nanosleep=false AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ @@ -818,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]) @@ -834,7 +839,7 @@ fi dnl Check for dbus AC_ARG_ENABLE(dbus, - [ --enable-dbus Linux D-BUS message bus system (default enabled)]) + [ --enable-dbus Linux D-BUS message bus system (default enabled)]) if test "${enable_dbus}" != "no" then @@ -1117,8 +1122,8 @@ 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([fixed32tos16 s16tofixed32 u8tofixed32]) +VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32]) +VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) VLC_ADD_PLUGINS([playlist export sgimb nsc xtag]) @@ -1132,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]) @@ -1348,7 +1353,7 @@ dnl Special arch tuning dnl AC_ARG_WITH(tuning, [ --with-tuning=ARCH enable special tuning for an architecture - (default Pentium 2 on IA-32 and 750 on PPC)]) + (default Pentium 2 on IA-32 and G4 on PPC)]) if test -n "${with_tuning}"; then if test "${with_tuning}" != "no"; then CFLAGS_TUNING="-mtune=${with_tuning}" @@ -1359,7 +1364,7 @@ else elif test "${target_cpu}" = "x86_64"; then CFLAGS_TUNING="-mtune=athlon64" elif test "${target_cpu}" = "powerpc"; then - CFLAGS_TUNING="-mtune=750"; + CFLAGS_TUNING="-mtune=G4"; fi fi @@ -1434,7 +1439,6 @@ test "${enable_release}" != "yes" && enable_release="no" dnl dnl Is the shared libvlc forced ? dnl -build_pic=no AC_ARG_ENABLE(shared-libvlc, [ --enable-shared-libvlc Win32 libvlc.dll build (default disabled)]) AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [ @@ -1455,6 +1459,7 @@ then VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp]) VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge]) # VLC_ADD_PLUGINS([stream_out_transrate]) + VLC_ADD_PLUGINS([profile_parser]) AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support) fi @@ -1466,8 +1471,8 @@ if test "${enable_shout}" = "yes"; then PKG_CHECK_MODULES(SHOUT, shout >= 2.1, [AC_DEFINE(HAVE_SHOUT, [], [Define if you have the libshout library]) VLC_ADD_PLUGINS([access_output_shout]) - VLC_ADD_LDFLAGS([vlc access_output_shout],[$SHOUT_LIBS]) - VLC_ADD_CFLAGS([vlc access_output_shout],[$SHOUT_CFLAGS])], + VLC_ADD_LDFLAGS([access_output_shout],[$SHOUT_LIBS]) + VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])], [AC_MSG_WARN(libshout library not found)]) fi @@ -1502,6 +1507,26 @@ AS_IF([test "${enable_growl}" != "no"], [ ] ) +dnl +dnl Libnotify notification plugin +dnl + +AC_ARG_ENABLE(notify, + [ --enable-notify libnotify notification plugin (default enabled)]) +AS_IF([test "${enable_notify}" != "no"], [ + PKG_CHECK_MODULES(NOTIFY, libnotify, + [ + VLC_ADD_PLUGINS([notify]) + VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS]) + VLC_ADD_LDFLAGS(notify, [$NOTIFY_LIBS]) + ],[ + AS_IF([test "${enable_notify}" = "yes"],[ + AC_MSG_WARN( libnotify not found) ]) + ]) + ]) + + + dnl dnl Input plugins @@ -1521,8 +1546,8 @@ then enable_live555="yes" fi AC_ARG_ENABLE(live555, -[ --enable-live555 live555 RTSP input plugin (default disabled)]) -if test "${enable_livedotcom}" = "yes"; then +[ --enable-live555 live555 RTSP input plugin (default disabled)]) +if test "${enable_live555}" = "yes"; then AC_ARG_WITH(live555-tree, [ --with-live555-tree=PATH live.com tree for static linking]) @@ -1971,6 +1996,28 @@ then CPPFLAGS="${CPPFLAGS_save}" fi +dnl +dnl Video4Linux plugin +dnl +AC_ARG_ENABLE(v4l2, + [ --enable-v4l2 Video4Linux2 input support (default disabled)]) +if test "${enable_v4l2}" = "yes" +then + AC_ARG_WITH(v4l2, + [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[]) + if test "${with_v4l2}" != "no" -a -n "${with_v4l2}" + then + VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) + fi + + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" + AC_CHECK_HEADERS(linux/videodev2.h, [ + VLC_ADD_PLUGINS([v4l2]) + ],[]) + CPPFLAGS="${CPPFLAGS_save}" +fi + + dnl dnl special access module for Hauppauge PVR cards dnl @@ -2585,10 +2632,13 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libavcodec/libpostproc ${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a]) + elif test -f "${real_ffmpeg_tree}/libpostproc/libpostproc.a"; then + VLC_ADD_LDFLAGS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}]) else dnl The given libavcodec wasn't built with --enable-pp AC_MSG_RESULT(no) - AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp]) + AC_MSG_ERROR([cannot find libpostproc.a in ${real_ffmpeg_tree}/[libavcodec/]libpostproc/. Make sure you configured ffmpeg with --enable-pp]) fi fi dnl Use a custom libffmpeg @@ -2702,7 +2752,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"]) @@ -2715,7 +2765,7 @@ dnl Trying with pkg-config if test "${enable_sout}" != "no"; then VLC_ADD_BUILTINS([stream_out_switcher]) fi], - [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (cvs version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) + [ AC_MSG_ERROR([Could not find ffmpeg on your system: you may get it from http://ffmpeg.sf.net/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) AC_CHECK_LIB(avformat, av_open_input_stream, [ @@ -3483,12 +3533,11 @@ if test "${enable_glx}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_glx}" = "yes"); then CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - AC_CHECK_HEADERS(X11/Xlib.h, [ - AC_CHECK_HEADERS(GL/glx.h, [ + AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h, [ VLC_ADD_PLUGINS([glx]) VLC_ADD_LDFLAGS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) - ]) ]) + ]) CPPFLAGS="${CPPFLAGS_save}" fi @@ -3566,12 +3615,12 @@ AC_ARG_ENABLE(opengl, if test "${enable_opengl}" != "no" && test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "darwin"; then - AC_CHECK_HEADERS(GL/gl.h, [ + AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ VLC_ADD_PLUGINS([opengl]) if test "${SYS}" != "mingw32"; then VLC_ADD_LDFLAGS([opengl],[${X_LIBS} -lGL -lGLU]) else - VLC_ADD_LDFLAGS([opengl],[-lopengl32]) + VLC_ADD_LDFLAGS([opengl],[-lopengl32 -lglu32]) fi ]) else @@ -3773,7 +3822,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]) @@ -3882,11 +3931,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 @@ -4597,6 +4650,26 @@ then fi fi +dnl +dnl QT 4 +dnl +enableqt4=false +AC_ARG_ENABLE(qt4, + [ --enable-qt4 QT 4 support (default disabled) ], + [if test "${enable_qt4}" = "yes"; then + PKG_CHECK_MODULES(QT4, QtCore QtGui, + [ VLC_ADD_PLUGINS([qt4]) + 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]) +AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true") + dnl dnl WinCE GUI module dnl @@ -4728,11 +4801,13 @@ AC_ARG_ENABLE(macosx, [if test "${enable_macosx}" = "yes" then VLC_ADD_BUILTINS([macosx]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL]) + VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) fi], [AC_CHECK_HEADERS(Cocoa/Cocoa.h, VLC_ADD_BUILTINS([macosx]) - VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL]) + VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL]) + VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) )]) CFLAGS=$ORIGCFLAGS @@ -4798,7 +4873,7 @@ AC_ARG_ENABLE(galaktos, [ --enable-galaktos OpenGL visualisation plugin (default disabled)]) if test "${enable_galaktos}" = "yes" then - AC_CHECK_HEADERS(GL/gl.h, [ + AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [ VLC_ADD_PLUGINS([galaktos]) if test "${SYS}" != "mingw32"; then VLC_ADD_LDFLAGS([galaktos],[${X_LIBS} -lGL -lGLU]) @@ -4950,6 +5025,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, [ @@ -5105,19 +5184,21 @@ then have_xul=true 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_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE]) +], + [], + [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE] + ]) + LDFLAGS="${LDFLAGS_save}" + 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_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`]]) @@ -5138,7 +5219,6 @@ then else xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" fi - fi dnl End of moz_sdk = "" else dnl special case for mingw32 @@ -5178,9 +5258,8 @@ then CPPFLAGS="${CPPFLAGS_save}" fi - if test "${mozilla}" != "false" + if test "${enable_mozilla}" != "false" then - build_pic=yes AC_PATH_PROG(XPIDL, xpidl, no, ${xpidl_path}:/usr/lib/mozilla:/usr/lib64/mozilla:/usr/lib/xulrunner:/usr/lib64/xulrunner) if test "${XPIDL}" = "no"; then AC_MSG_ERROR([Please install the Mozilla development tools, xpidl was not found.]) @@ -5196,22 +5275,20 @@ AC_ARG_ENABLE(mediacontrol-python-bindings, [ --enable-mediacontrol-python-bindings Enable Python bindings for MediaControl (default disabled)]) dnl TODO: look for python dev headers AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"]) -if test "${enable_mediacontrol_python_bindings}" = "yes" -then - build_pic=yes -fi dnl dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) -AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) if test "${enable_java_bindings}" = "yes" then - build_pic=yes + 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 - +AM_CONDITIONAL(BUILD_JAVA, [test "${enable_java_bindings}" = "yes"]) dnl dnl test plugins @@ -5344,14 +5421,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 -pic=no -AS_IF([test "${build_pic}" = "yes"], [pic=pic]) -AS_IF([test "${SYS}" = "mingw32"], [pic=no]) -AS_IF([test "${pic}" = "no"], [pic=]) +case "${target_cpu}" in + x86_64) + pic=pic + ;; + *) + pic="" + ;; +esac AC_SUBST(pic) -AM_CONDITIONAL(BUILD_PIC, [test "${build_pic}" = "yes" && test "x${pic}" = "xpic"]) dnl Import conditional variables generated by bootstrap VLC_CONDITIONALS @@ -5379,8 +5461,8 @@ dnl VLC_SYMBOL="`echo ${VERSION} | sed -e 'y/.-+/___/'`" dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for module functions]) dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions]) -dnl New definitions with value matching 0.8.5 release -module_symbol="0_8_5" +dnl New definitions with value matching 0.8.6 release +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}" @@ -5412,12 +5494,14 @@ 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) AC_SUBST(XPIDL) AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) -AC_SUBST(INCLUDES) +AC_SUBST(AM_CPPFLAGS) AC_SUBST(ALL_LINGUAS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(FILE_LIBVLC_DLL) @@ -5435,6 +5519,7 @@ AC_CONFIG_FILES([ activex/axvlc.inf bindings/Makefile bindings/java/Makefile + bindings/java/src/Makefile bindings/mediacontrol-python/Makefile doc/Makefile intl/Makefile @@ -5453,8 +5538,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 @@ -5488,6 +5571,7 @@ AC_CONFIG_FILES([ modules/gui/pda/Makefile modules/gui/macosx/Makefile modules/gui/qnx/Makefile + modules/gui/qt4/Makefile modules/gui/skins2/Makefile modules/gui/wxwidgets/Makefile modules/gui/wince/Makefile @@ -5498,6 +5582,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