X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=c27cb7f5c9dcf9872be499ba548e0be8c806f705;hb=6810a85e35b332e3c17149dbd0104cdd42d2db13;hp=273181382ed53b5d216110f3f28132e3016a619c;hpb=9d85b9dace93996a50fbf415463c058aaa1fe815;p=vlc diff --git a/configure.ac b/configure.ac index 273181382e..c27cb7f5c9 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ VERSION_EXTRA="svn" CONFIGURE_LINE="$0 $*" CODENAME="Janus" -AC_PREREQ(2.50) +AC_PREREQ(2.59) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) AC_CANONICAL_SYSTEM @@ -37,9 +37,8 @@ VLC_SAVE_FLAGS dnl dnl Check for tools dnl -AC_PROG_CC +AC_PROG_CC_C99 AM_PROG_CC_C_O -AC_PROG_CPP AC_PROG_CXX eval "${CXX} --version" >/dev/null 2>&1 || CXX="" if test "${CXX}" != ""; then @@ -71,19 +70,10 @@ AC_CHECK_TOOL(STRIP, strip, :) AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(LD, ld, :) -AC_DISABLE_STATIC -AC_LIBTOOL_DLOPEN -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -AC_ARG_ENABLE(libtool, - [ --enable-libtool use libtool (default disabled, EXPERIMENTAL)], - [],[enable_libtool="no"]) -AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"]) - dnl Check for compiler properties AC_C_CONST AC_C_INLINE +AC_C_RESTRICT dnl dnl Check for the contrib directory @@ -96,7 +86,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]) @@ -208,6 +198,7 @@ case "${target_os}" in ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) + enable_libtool="no" case "${target_os}" in *mingw32*) @@ -286,6 +277,21 @@ AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") +dnl +dnl Libtool +dnl It's very bad, but our former custom system was worst +dnl -- Courmisch +dnl +AC_DISABLE_STATIC +AC_LIBTOOL_DLOPEN +dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(libtool, + [ --enable-libtool use libtool (default disabled)]) +AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"]) + + dnl dnl Check for Mac OS X SDK settings dnl @@ -306,20 +312,23 @@ dnl ALL_LINGUAS="ca cs da de en_GB es fr gl he hi hu it ja ka ko nl oc pt_BR ro ru sv tr zh_CN zh_TW" 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) +AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ + AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl]) AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl" AS_IF([test "${enable_libtool}" != "no"], [ INCLUDED_LIBINTL="${LTLIBINTL}" ],[ INCLUDED_LIBINTL="${LIBINTL}" ]) -else - VLC_ADD_LDFLAGS([vlc],[${LIBINTL}]) - INCLUDED_LIBINTL= -fi +], [ + AS_IF([test "${enable_libtool}" != "no"], [ + VLC_ADD_LDFLAGS([vlc], [${LTLIBINTL}]) + ], [ + VLC_ADD_LDFLAGS([vlc], [${LIBINTL}]) + ]) +]) AC_SUBST(INCLUDED_LIBINTL) -XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS" +XGETTEXT="${XGETTEXT} --keyword=_NS --keyword=_ANS" dnl dnl Iconv stuff @@ -564,7 +573,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]) @@ -775,6 +784,8 @@ fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" AC_HEADER_TIME +AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])]) + dnl Check for dirent need_dirent=false AC_CHECK_HEADERS(dirent.h,,[need_dirent=:]) @@ -823,9 +834,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,8 +1133,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]) @@ -1134,6 +1145,7 @@ VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4]) VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) 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]) @@ -1160,7 +1172,7 @@ dnl dnl Some plugins aren't useful on some platforms dnl if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - VLC_ADD_PLUGINS([screensaver]) + VLC_ADD_PLUGINS([screensaver motion]) elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGINS([ntservice access_smb dmo msn]) VLC_ADD_LDFLAGS([dmo],[-lole32]) @@ -1331,7 +1343,9 @@ if test "${ac_cv_c_altivec}" != "no"; then VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}]) VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}]) VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}]) - ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" + if test "${ac_cv_altivec_inline}" = "no"; then + ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}" + fi fi AC_CACHE_CHECK([if linker needs -framework vecLib], @@ -1353,7 +1367,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}" @@ -1364,7 +1378,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 @@ -1459,10 +1473,14 @@ 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 +AC_ARG_ENABLE(switcher, + [ --enable-switcher Stream-out switcher plugin (default disabled)]) + dnl Check for libshout AC_ARG_ENABLE(shout, [ --enable-shout libshout output plugin (default disabled)]) @@ -1470,8 +1488,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 @@ -1863,6 +1881,45 @@ then fi fi + +dnl +dnl OpenCV wrapper and example filters +dnl +AC_ARG_ENABLE(opencv, + [ --enable-opencv OpenCV (computer vision) filter (default disabled)]) +if test "${enable_opencv}" = "yes" -a "${CXX}" != ""; +then + AC_ARG_WITH(opencv-tree, + [ --with-opencv-tree=PATH opencv tree for linking]) + if test -n "${with_opencv_tree}" + then + if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" + then + AC_MSG_CHECKING(for opencv in ${with_opencv_tree}) + if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \ + -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h + then + AC_MSG_RESULT(yes) + VLC_ADD_PLUGINS([opencv_wrapper]) + VLC_ADD_LDFLAGS([opencv_wrapper],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) + VLC_ADD_CFLAGS([opencv_wrapper],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) + AC_LANG_PUSH(C++) + VLC_ADD_PLUGINS([opencv_example]) + VLC_ADD_LDFLAGS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) + VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) + AC_LANG_POP(C++) + else + dnl No opencv could be found, sorry + AC_MSG_RESULT(no) + AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}]) + fi + else + AC_MSG_WARN([--enable-opencv currently only works on windows]) + fi + fi +fi + + dnl dnl libsmbclient plugin dnl @@ -1898,7 +1955,7 @@ then AC_CHECK_HEADERS(dvbpsi/dr.h, [ VLC_ADD_PLUGINS([ts]) if test "${enable_sout}" != "no"; then - VLC_ADD_BUILTINS([mux_ts]) + VLC_ADD_PLUGINS([mux_ts]) fi VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ], [ AC_MSG_WARN([cannot find libdvbpsi headers]) ], @@ -1995,6 +2052,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 @@ -2609,10 +2688,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 @@ -2653,7 +2735,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo fi VLC_ADD_BUILTINS([ffmpeg]) - if test "${enable_sout}" != "no"; then + if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then VLC_ADD_BUILTINS([stream_out_switcher]) fi @@ -2689,7 +2771,7 @@ dnl Look for a ffmpeg-config (we are on debian ) AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(postproc/postprocess.h) VLC_ADD_PLUGINS([ffmpeg]) - if test "${enable_sout}" != "no"; then + if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then VLC_ADD_PLUGINS([stream_out_switcher]) fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) @@ -2704,12 +2786,20 @@ dnl Trying with pkg-config AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avutil.h) AC_CHECK_HEADERS(postproc/postprocess.h) - VLC_ADD_BUILTINS([ffmpeg]) - if test "${enable_sout}" != "no"; then - VLC_ADD_BUILTINS([stream_out_switcher]) + if test "${SYS}" = "darwin"; then + VLC_ADD_BUILTINS([ffmpeg]) + else + VLC_ADD_PLUGINS([ffmpeg]) + fi + if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then + if test "${SYS}" = "darwin"; then + VLC_ADD_BUILTINS([stream_out_switcher]) + else + VLC_ADD_PLUGINS([stream_out_switcher]) + fi fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) - VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}]) + VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) dnl newer ffmpeg have a separate libpostproc PKG_CHECK_MODULES(POSTPROC, libpostproc,[ VLC_ADD_LDFLAGS([ffmpeg],[${POSTPROC_LIBS}]) @@ -2726,7 +2816,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"]) @@ -2736,7 +2826,7 @@ dnl Trying with pkg-config AC_CHECK_LIB(avcodec, avcodec_init, [ VLC_ADD_BUILTINS([ffmpeg]) VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec]) - if test "${enable_sout}" != "no"; then + if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; 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/ (svn version is recommended). Alternatively you can use --disable-ffmpeg to disable the ffmpeg plugins.]) ], [$LDAVUTIL]) @@ -3311,11 +3401,7 @@ if test "${enable_theora}" = "yes" then AC_CHECK_HEADERS(theora/theora.h, [ AC_CHECK_LIB(theora, theora_granule_time, [ - if test "${SYS}" = "mingw32"; then - VLC_ADD_PLUGINS([theora]) - else - VLC_ADD_BUILTINS([theora]) - fi + VLC_ADD_PLUGINS([theora]) theora_libs="-ltheora -logg" VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[ AC_MSG_ERROR([libtheora doesn't appear to be installed on your system. @@ -3796,7 +3882,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]) @@ -3905,11 +3991,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 @@ -4629,10 +4719,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]) @@ -4770,10 +4862,12 @@ AC_ARG_ENABLE(macosx, then VLC_ADD_BUILTINS([macosx]) 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 -framework AGL]) + VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) )]) CFLAGS=$ORIGCFLAGS @@ -4984,29 +5078,15 @@ AC_ARG_ENABLE(gnutls, [ --enable-gnutls gnutls TLS/SSL support (default enabled)]) AS_IF([test "${enable_gnutls}" != "no"], [ - gcrypt_LIBS="-lgpg-error" - AS_IF([test "${SYS}" = "mingw32"], [ - gcrypt_LIBS="${gcrypt_LIBS} -lws2_32" - VLC_ADD_LDFLAGS([gnutls],[-lws2_32]) - ]) - - gnutls_LIBS="-lgcrypt -lz ${gcrypt_LIBS}" - - AC_CHECK_HEADER(gcrypt.h, [ - AC_CHECK_LIB(gcrypt, gcry_control, [ - AC_CHECK_HEADER(gnutls/gnutls.h, [ - AC_CHECK_LIB(gnutls, gnutls_certificate_verify_peers2, - [have_gnutls="yes"],[old_gnutls="yes"],[${gnutls_LIBS}]) - ]) - ],,[${gcrypt_LIBS}]) - ]) + PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.2.9], [have_gnutls="yes"], [have_gnutls="no"]) AS_IF([test "${have_gnutls}" = "yes"], [ VLC_ADD_PLUGINS([gnutls]) - VLC_ADD_LDFLAGS([gnutls], [-lgnutls ${gnutls_LIBS}]) + VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS]) + VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS]) ], [ AS_IF([test "${enable_gnutls}" = "yes"], [ - AC_MSG_ERROR([gnutls not present or too old (version 1.0.17 required)]) + AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)]) ]) ]) ]) @@ -5094,11 +5174,24 @@ dnl activex=false AC_ARG_ENABLE(activex, [ --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" then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then - AC_CHECK_PROGS(MIDL, [midl widl], no) + AC_CHECK_PROGS(MIDL, [midl], no) + if test "${with_wine_sdk_path}" != "" + then + WINE_SDK_PATH=${with_wine_sdk_path} + AC_PATH_PROG(WIDL, widl, no, [$WINE_SDK_PATH/bin:$WINE_SDK_PATH/tools/widl]) + else + AC_CHECK_PROGS(WIDL, [widl], no) + if test "${WIDL}" != "no" + then + WINE_SDK_PATH="`dirname ${WIDL}`"/.. + fi + fi AC_LANG_PUSH(C++) AC_CHECK_HEADERS(ole2.h olectl.h, [ VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) @@ -5118,6 +5211,8 @@ then fi AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)]) AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no") +AC_ARG_VAR(WIDL, [Wine IDL compiler (requires Wine SDK)]) +AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no") AM_CONDITIONAL(BUILD_ACTIVEX,${activex}) dnl @@ -5138,27 +5233,35 @@ then AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no) if test "${MOZILLA_CONFIG}" = "no" then - AC_PATH_PROG(XULRUNNER_CONFIG, xulrunner-config, no) - if test "${XULRUNNER_CONFIG}" = "no" + AC_PATH_PROG(SEAMONKEY_CONFIG, seamonkey-config, no) + if test "${SEAMONKEY_CONFIG}" = "no" then - AC_MSG_ERROR([Please install the Mozilla development tools, mozilla-config was not found.]) + 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 - have_xul=true - MOZILLA_CONFIG="${XULRUNNER_CONFIG}" + MOZILLA_CONFIG="${SEAMONKEY_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`]]) @@ -5179,7 +5282,6 @@ then else xpidl_path="`${MOZILLA_CONFIG} --prefix`/bin" fi - fi dnl End of moz_sdk = "" else dnl special case for mingw32 @@ -5242,6 +5344,13 @@ dnl Java bindings dnl AC_ARG_ENABLE(java-bindings, [ --enable-java-bindings Enable Java bindings (default disabled)]) +if test "${enable_java_bindings}" = "yes" +then + 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 @@ -5376,10 +5485,6 @@ AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"], FILE_LIBVLC_DLL="" ) -pic=pic -AS_IF([test "${SYS}" = "mingw32"], [pic=]) -AC_SUBST(pic) - dnl Import conditional variables generated by bootstrap VLC_CONDITIONALS @@ -5407,7 +5512,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_6b" 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}" @@ -5439,9 +5544,11 @@ 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(WINE_SDK_PATH) AC_SUBST(XPIDL) AC_SUBST(XPIDL_INCL) AC_SUBST(LIBEXT) @@ -5463,6 +5570,7 @@ AC_CONFIG_FILES([ activex/axvlc.inf bindings/Makefile bindings/java/Makefile + bindings/java/src/Makefile bindings/mediacontrol-python/Makefile doc/Makefile intl/Makefile @@ -5481,8 +5589,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 @@ -5527,6 +5633,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