X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=5ac071186ea118f30c086b31e0949aacf46df4e5;hb=de31813fc07c398e906346df090bf4680212a85c;hp=63eeb5349f28c8fda62f6e9f9e17defdca307e0f;hpb=6c93b8b782cfd0bb3c053e994f63fcdfc781bad0;p=vlc diff --git a/configure.ac b/configure.ac index 63eeb5349f..5ac071186e 100644 --- a/configure.ac +++ b/configure.ac @@ -796,7 +796,13 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h) -AC_CHECK_HEADERS([arpa/inet.h net/if.h netinet/in.h sys/socket.h netinet/udplite.h]) +AC_CHECK_HEADERS([arpa/inet.h netinet/in.h sys/socket.h netinet/udplite.h]) +AC_CHECK_HEADERS([net/if.h], [], [], + [ + #if HAVE_SYS_SOCKET_H + # include + #endif + ]) if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(machine/param.h sys/shm.h) AC_CHECK_HEADERS([linux/version.h linux/dccp.h]) @@ -899,8 +905,12 @@ then VLC_ADD_PLUGINS([telepathy]) VLC_ADD_LIBS([telepathy],[$DBUS_LIBS]) VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS]) - fi], - + fi + dnl Power Management Inhibiter + VLC_ADD_PLUGINS([inhibit]) + VLC_ADD_LIBS([inhibit],[$DBUS_LIBS]) + VLC_ADD_CFLAGS([inhibit],[$DBUS_CFLAGS]) + ], if ${PKG_CONFIG} --exists dbus-1 then [AC_ARG_ENABLE(old-dbus, @@ -1207,12 +1217,11 @@ dnl default modules dnl VLC_ADD_PLUGINS([dummy logger memcpy]) VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 demux_cdg cdg ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta]) -VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub mpeg_audio lpcm a52 dts cinepak flac]) +VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf t140 dvbsub cc mpeg_audio lpcm a52 dts cinepak flac]) VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving]) VLC_ADD_PLUGINS([converter_fixed mono]) VLC_ADD_PLUGINS([trivial_resampler ugly_resampler]) VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer]) -VLC_ADD_PLUGINS([spatializer]) VLC_ADD_PLUGINS([playlist export nsc xtag]) VLC_ADD_PLUGINS([i420_rgb grey_yuv rawvideo blend scale image logo magnify puzzle colorthres]) VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv smf]) @@ -1223,10 +1232,16 @@ VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) VLC_ADD_PLUGINS([packetizer_vc1]) +dnl +dnl default modules that need g++ +dnl +AC_LANG_PUSH(C++) +VLC_ADD_PLUGINS([spatializer]) +AC_LANG_POP(C++) if test "${SYS}" != "mingwce"; then VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record access_filter_dump]) - VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder]) + VLC_ADD_PLUGINS([gestures rc telnet hotkeys showintf marq podcast shout sap fake folder]) VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop erase bluescreen alphamask gaussianblur]) VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) @@ -1481,7 +1496,7 @@ if test -n "${with_tuning}"; then CFLAGS_TUNING="-mtune=${with_tuning}" fi else - if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then + if test "${SYS}" = "darwin" -a "${host_cpu}" != "powerpc"; then CFLAGS_TUNING="-march=pentium-m -mtune=prescott" elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then CFLAGS_TUNING="-mtune=pentium2" @@ -2025,7 +2040,7 @@ then then AC_CHECK_HEADERS(dvdread/dvd_reader.h, [ VLC_ADD_PLUGINS([dvdread]) - VLC_ADD_LIBS([dvdread],[-ldvdread ${LDFLAGS_dvdcss}]) + VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}]) ],[ if test -n "${enable_dvdread}" then @@ -2046,7 +2061,7 @@ then dnl Use a custom libdvdread AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a) VLC_ADD_BUILTINS([dvdread]) - VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LDFLAGS_dvdcss}]) + VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}]) VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}]) else dnl The given libdvdread wasn't built @@ -2061,7 +2076,7 @@ then dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h AC_MSG_RESULT(yes) VLC_ADD_PLUGINS([dvdread]) - VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LDFLAGS_dvdcss}]) + VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LIBS_dvdcss}]) VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include]) else dnl No libdvdread could be found, sorry @@ -2279,7 +2294,7 @@ then esac AC_CHECK_LIB(dvbpsi, dvbpsi_GenSDTSections, [ AC_DEFINE(HAVE_DVBPSI_SDT, 1, [Define if you have dvbpsi_GenSDTSections.]) - ], [], [${LDFLAGS_ts}]) + ], [], [${LIBS_ts}]) fi @@ -2830,7 +2845,7 @@ then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${real_mad_tree}]) VLC_ADD_LIBS([mpgatofixed32],[-L${real_mad_tree}/.libs]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" + LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}" AC_CHECK_LIB(mad, mad_bit_init, [ VLC_ADD_BUILTINS([mpgatofixed32]) VLC_ADD_LIBS([mpgatofixed32],[-lmad]) @@ -2843,7 +2858,7 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_mpgatofixed32}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_mpgatofixed32}" + LDFLAGS="${LDFLAGS_save} ${LIBS_mpgatofixed32}" AC_CHECK_HEADERS(mad.h, , [ AC_MSG_ERROR([Could not find libmad on your system: you may get it from http://www.underbit.com/products/mad/. Alternatively you can use --disable-mad to disable the mad plugin.]) ]) AC_CHECK_LIB(mad, mad_bit_init, [ @@ -2873,7 +2888,7 @@ dnl dnl ffmpeg decoder/demuxer plugin dnl dnl we try to find ffmpeg using : 1- given tree 2- ffmpeg-config, 3- pkg-config -dnl 4- default place, +dnl 4- default place, AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default enabled)]) @@ -2886,21 +2901,21 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo [ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support], [ if test "$with_ffmpeg_mp3lame" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lmp3lame]) + VLC_ADD_LIBS([ffmpeg],[-lmp3lame]) fi]) AC_ARG_WITH(ffmpeg-faac, [ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support], [ if test "$with_ffmpeg_faac" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lfaac]) + VLC_ADD_LIBS([ffmpeg],[-lfaac]) fi]) AC_ARG_WITH(ffmpeg-dts, [ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support], [ if test "$with_ffmpeg_dts" = "yes"; then - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}" AC_CHECK_LIB(dts_pic, dts_free, [ VLC_ADD_LIBS([ffmpeg],[-ldts_pic]) ], [ VLC_ADD_LIBS([ffmpeg],[-ldts]) ]) @@ -2932,35 +2947,35 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo [ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support], [ if test "$with_ffmpeg_zlib" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lz]) + VLC_ADD_LIBS([ffmpeg],[-lz]) fi]) AC_ARG_WITH(ffmpeg-amrnb, [ --with-ffmpeg-amrnb specify if ffmpeg has been compiled with libamrnb support], [ if test "$with_ffmpeg_amrnb" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lamrnb]) + VLC_ADD_LIBS([ffmpeg],[-lamrnb]) fi]) AC_ARG_WITH(ffmpeg-amrwb, [ --with-ffmpeg-amrwb specify if ffmpeg has been compiled with libamrwb support], [ if test "$with_ffmpeg_amrwb" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lamrwb]) + VLC_ADD_LIBS([ffmpeg],[-lamrwb]) fi]) AC_ARG_WITH(ffmpeg-x264, [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libamrnb support], [ if test "$with_ffmpeg_x264" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-lx264]) + VLC_ADD_LIBS([ffmpeg],[-lx264]) fi]) AC_ARG_WITH(ffmpeg-a52, [ --with-ffmpeg-a52 specify if ffmpeg has been compiled with liba52 support], [ if test "$with_ffmpeg_a52" = "yes"; then - VLC_ADD_LIBS([ffmpeg],[-la52]) + VLC_ADD_LIBS([ffmpeg],[-la52]) fi]) dnl @@ -2986,7 +3001,7 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo if test -f "${real_ffmpeg_tree}/libavcodec/libpostproc/libpostproc.a"; then VLC_ADD_LIBS([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_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libpostproc ${real_ffmpeg_tree}/libpostproc/libpostproc.a]) + VLC_ADD_LIBS([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 @@ -2996,43 +3011,42 @@ dnl Those options have to be here because the .pc can be bogus for ffmpeg previo fi dnl Use a custom libffmpeg AC_MSG_RESULT(${real_ffmpeg_tree}/libavcodec/libavcodec.a) - + dnl Use pkg-config to look for the ldflags in libav*-uninstalled.pc PKG_CONFIG_PATH_save="$PKG_CONFIG_PATH" PKG_CONFIG_LIBDIR_save="$PKG_CONFIG_LIBDIR" export PKG_CONFIG_PATH="" export PKG_CONFIG_LIBDIR="${real_ffmpeg_tree}" - + PKG_CHECK_MODULES( [FFMPEG],[libavcodec libavformat libpostproc], [ - VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) - VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] + VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher], ${FFMPEG_CFLAGS}) + VLC_ADD_LIBS([ffmpeg stream_out_switcher], ${FFMPEG_LIBS})] ,[]) AS_IF([test -n "${PKG_CONFIG_PATH_save}"],[ export PKG_CONFIG_PATH="${PKG_CONFIG_PATH_save}" ],[ - unset PKG_CONFIG_PATH + unset PKG_CONFIG_PATH ]) AS_IF([test -n "${PKG_CONFIG_LIBDIR_save}"],[ - export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" + export PKG_CONFIG_LIBDIR="${PKG_CONFIG_LIBDIR_save}" ],[ unset PKG_CONFIG_LIBDIR ]) - + VLC_ADD_BUILTINS([ffmpeg]) if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes" ; then VLC_ADD_BUILTINS([stream_out_switcher]) fi - if test -f "${real_ffmpeg_tree}/libswscale/libswscale.a"; then AC_DEFINE(HAVE_LIBSWSCALE_TREE, 1, [Define if you have ffmpeg's libswscale.]) VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libswscale ${real_ffmpeg_tree}/libswscale/libswscale.a]) VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libswscale]) fi -else - +else + dnl Look for a ffmpeg-config (we are on debian ) - + FFMPEG_PATH="${PATH}" AC_ARG_WITH(ffmpeg-config-path, [ --with-ffmpeg-config-path=PATH ffmpeg-config path (default search in \$PATH)], @@ -3053,7 +3067,7 @@ dnl Look for a ffmpeg-config (we are on debian ) fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --cflags`]) VLC_ADD_LIBS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`]) - + else dnl Trying with pkg-config @@ -3063,8 +3077,8 @@ dnl Trying with pkg-config CPPFLAGS="${CPPFLAGS} ${FFMPEG_CFLAGS}" CFLAGS="${CFLAGS} ${FFMPEG_CFLAGS}" AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) - AC_CHECK_HEADERS(ffmpeg/avformat.h) - AC_CHECK_HEADERS(ffmpeg/avutil.h) + AC_CHECK_HEADERS(ffmpeg/avformat.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avformat.h.])] ) + AC_CHECK_HEADERS(ffmpeg/avutil.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avutil.h.])] ) dnl newer ffmpeg have a separate libpostproc PKG_CHECK_MODULES(POSTPROC, libpostproc,[ VLC_ADD_CFLAGS([ffmpeg],[${POSTPROC_CFLAGS}]) @@ -3087,21 +3101,23 @@ dnl Trying with pkg-config fi VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}]) VLC_ADD_LIBS([ffmpeg stream_out_switcher],[${FFMPEG_LIBS}]) + dnl even newer ffmpeg has a libswscale - PKG_CHECK_MODULES(SWSCALE, libswscale,[ - VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) - VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) + PKG_CHECK_MODULES(SWSCALE,[libswscale],[ + VLC_ADD_CFLAGS([ffmpeg],[${SWSCALE_CFLAGS}]) + VLC_ADD_LIBS([ffmpeg],[${SWSCALE_LIBS}]) +dnl AC_CHECK_HEADERS(ffmpeg/swscale.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/swscale.h.])]) AC_CHECK_LIB(swscale, sws_getContext, - [AC_CHECK_HEADERS(ffmpeg/swscale.h)],[]) + [AC_CHECK_HEADERS([ffmpeg/avutil.h, ffmpeg/swscale.h])],[],[-lavutil -lm]) ],[ true ]) VLC_RESTORE_FLAGS ],[ - + dnl dnl last chance: at the default place dnl CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_ffmpeg}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg} ${LIBS_ffmpeg}" AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] ) AC_CHECK_HEADERS(ffmpeg/avformat.h) AC_CHECK_HEADERS(ffmpeg/avutil.h) @@ -3119,11 +3135,10 @@ dnl Trying with pkg-config 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]) - AC_CHECK_LIB(postproc, pp_postprocess, [ VLC_ADD_LIBS([ffmpeg],[-lpostproc])], - AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), - [$LDAVUTIL]) + AC_MSG_ERROR([Could not find libpostproc inside FFmpeg. You should configure FFmpeg with --enable-gpl --enable-pp.]), + [$LDAVUTIL]) AC_CHECK_LIB(avformat, av_open_input_stream, [ VLC_ADD_LIBS([ffmpeg],[-lavformat -lz]) ], [], [-lavcodec -lz $LDAVUTIL]) @@ -3215,7 +3230,7 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_faad}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_faad}" + LDFLAGS="${LDFLAGS_save} ${LIBS_faad}" AC_CHECK_HEADERS(faad.h, , [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ]) AC_CHECK_LIB(faad, faacDecOpen, [ @@ -3224,7 +3239,7 @@ then AC_CHECK_LIB(faad, NeAACDecOpen, [ VLC_ADD_PLUGINS([faad]) VLC_ADD_LIBS([faad],[-lfaad]) ], - [ AC_MSG_ERROR([Cannot find libfaad library...]) ],[-lm])) + [ AC_MSG_ERROR([Cannot find libfaad library...]) ])) LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" fi @@ -3263,7 +3278,7 @@ then fi else CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_twolame} -DLIBTWOLAME_STATIC" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_twolame}" + LDFLAGS="${LDFLAGS_save} ${LIBS_twolame}" AC_CHECK_HEADERS(twolame.h, , [ AC_MSG_ERROR([Cannot find development header for libtwolame...]) ]) AC_CHECK_LIB(twolame, twolame_init, [ @@ -3362,7 +3377,7 @@ then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([a52tofloat32],[-I${real_a52_tree}]) VLC_ADD_LIBS([a52tofloat32],[-L${real_a52_tree}/liba52/.libs]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_a52tofloat32} -lm" + LDFLAGS="${LDFLAGS_save} ${LIBS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ VLC_ADD_BUILTINS([a52tofloat32]) VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) @@ -3390,7 +3405,7 @@ then CPPFLAGS_test="-I${with_a52}/include" fi CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_test} ${CPPFLAGS_a52tofloat32}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LDFLAGS_a52tofloat32}" + LDFLAGS="${LDFLAGS_save} ${LDFLAGS_test} ${LIBS_a52tofloat32}" AC_CHECK_HEADERS(a52dec/a52.h, [ AC_CHECK_LIB(a52, a52_free, [ VLC_ADD_PLUGINS([a52tofloat32]) @@ -3640,7 +3655,7 @@ then fi else AC_CHECK_HEADERS(speex/speex.h, [ - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_speex}" + LDFLAGS="${LDFLAGS_save} ${LIBS_speex}" AC_CHECK_LIB(speex, speex_decode_int, [ VLC_ADD_PLUGINS([speex]) VLC_ADD_LIBS([speex],[-lspeex]) ], @@ -3704,7 +3719,7 @@ dnl AC_ARG_ENABLE(dirac, [ --enable-dirac experimental dirac codec (default disabled)]) if test "${enable_dirac}" = "yes"; then - PKG_CHECK_MODULES(DIRAC,[dirac >= 0.6.0], [ + PKG_CHECK_MODULES(DIRAC,[dirac >= 0.8.0], [ VLC_ADD_PLUGINS([dirac]) VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS]) VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[ @@ -3754,7 +3769,7 @@ if test "${enable_x264}" != "no"; then AC_MSG_RESULT(yes) VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}]) VLC_ADD_LIBS([x264],[-L${real_x264_tree}]) - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}" + LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}" AC_CHECK_LIB(x264, x264_encoder_open, [ VLC_ADD_BUILTINS([x264]) VLC_ADD_LIBS([x264],[-lx264]) @@ -3767,7 +3782,7 @@ if test "${enable_x264}" != "no"; then AC_MSG_ERROR([the specified tree doesn't have x264.h]) fi else - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}" + LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}" AC_CHECK_HEADERS(x264.h, [ AC_CHECK_LIB(x264, x264_encoder_open, [ VLC_ADD_PLUGINS([x264]) @@ -3786,7 +3801,7 @@ dnl dnl libfluidsynth (MIDI synthetizer) plugin dnl AC_ARG_ENABLE(fluidsynth, - [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default auto)]) + [ --enable-fluidsynth MIDI synthesisr with libfluidsynth (default enabled)]) AS_IF([test "x${enable_fluidsynth}" != "xno"], [ PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth, [ VLC_ADD_PLUGINS(fluidsynth) @@ -4202,8 +4217,8 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice then VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI]) - VLC_ADD_LDFLAGS([freetype], [`${FRIBIDI_CONFIG} --libs`]) - VLC_ADD_LDFLAGS([skins2], [`${FRIBIDI_CONFIG} --libs`]) + VLC_ADD_LIBS([freetype], [`${FRIBIDI_CONFIG} --libs`]) + VLC_ADD_LIBS([skins2], [`${FRIBIDI_CONFIG} --libs`]) fi fi fi @@ -4224,10 +4239,10 @@ then AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH}) if test "${XML2_CONFIG}" != "no"; then VLC_ADD_CPPFLAGS([xml],[`${XML2_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([xml],[`${XML2_CONFIG} --libs`]) + VLC_ADD_LIBS([xml],[`${XML2_CONFIG} --libs`]) dnl depends on the xmlTextReader extension CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}" - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}" + LDFLAGS="${LDFLAGS_save} ${LIBS_xml}" AC_CHECK_LIB(xml2,xmlTextReaderConstName,[ AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[ VLC_ADD_PLUGINS([xml]) ],[ @@ -4259,7 +4274,7 @@ then PKG_CHECK_MODULES(SVG, librsvg-2.0 >= 2.9.0, [ - VLC_ADD_LDFLAGS([svg],[$SVG_LIBS]) + VLC_ADD_LIBS([svg],[$SVG_LIBS]) VLC_ADD_CFLAGS([svg],[$SVG_CFLAGS]) VLC_ADD_PLUGINS([svg]) ], [AC_MSG_WARN(SVG library not found)]) @@ -4314,10 +4329,10 @@ dnl VLC_ADD_PLUGINS([qt_video]) dnl VLC_ADD_LIBS([qt_video],[-L${QTDIR}/lib]) dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_qt_video}" dnl AC_CHECK_LIB(qt-mt,main,[ -dnl VLC_ADD_LDFLAGS([qt_video],[-lqt-mt]) +dnl VLC_ADD_LIBS([qt_video],[-lqt-mt]) dnl ],[ dnl AC_CHECK_LIB(qt,main,[ -dnl VLC_ADD_LDFLAGS([qt_video],[-lqt]) +dnl VLC_ADD_LIBS([qt_video],[-lqt]) dnl ]) dnl ]) dnl NEED_QTE_MAIN=yes @@ -4345,7 +4360,7 @@ if test "${enable_hd1000v}" != "no" -a "${CXX}" != "" && if test "$can_build_roku" = "yes" then VLC_ADD_PLUGINS([hd1000v]) - VLC_ADD_LDFLAGS([hd1000v],[-lCascade -ldvbpsi -lmad]) + VLC_ADD_LIBS([hd1000v],[-lCascade -ldvbpsi -lmad]) fi AC_LANG_POP([C++]) fi @@ -4371,15 +4386,15 @@ then then AC_CHECK_HEADERS(ddraw.h, [ VLC_ADD_PLUGINS([vout_directx aout_directx]) - VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) + VLC_ADD_LIBS([vout_directx],[-lgdi32]) ]) AC_CHECK_HEADERS(GL/gl.h, [ VLC_ADD_PLUGINS([glwin32]) - VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32]) + VLC_ADD_LIBS([glwin32],[-lopengl32 -lgdi32]) ]) AC_CHECK_HEADERS(d3d9.h, [ VLC_ADD_PLUGINS([direct3d]) - VLC_ADD_LDFLAGS([direct3d],[-lgdi32]) + VLC_ADD_LIBS([direct3d],[-lgdi32]) ]) else AC_MSG_CHECKING(for directX headers in ${with_directx}) @@ -4387,7 +4402,7 @@ then then VLC_ADD_PLUGINS([vout_directx aout_directx]) VLC_ADD_CPPFLAGS([vout_directx aout_directx],[-I${with_directx}]) - VLC_ADD_LDFLAGS([vout_directx],[-lgdi32]) + VLC_ADD_LIBS([vout_directx],[-lgdi32]) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -4427,7 +4442,7 @@ AC_ARG_ENABLE(svgalib, if test "${enable_svgalib}" = "yes" then VLC_ADD_PLUGINS([svgalib]) - VLC_ADD_LDFLAGS([svgalib],[-lvgagl -lvga]) + VLC_ADD_LIBS([svgalib],[-lvgagl -lvga]) fi dnl @@ -4443,18 +4458,18 @@ AC_ARG_WITH(directfb, if test "${enable_directfb}" = "yes"; then have_directfb="false" CPPFLAGS_mydirectfb= - LDFLAGS_mydirectfb= + LIBS_mydirectfb= if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then dnl Trying the given location - CPPFLAGS_save=${CPPFLAGS} - LDFLAGS_save=${LDFLAGS} + CPPFLAGS_save="${CPPFLAGS}" + LIBS_save="${LIBS}" CPPFLAGS_new="-I${with_directfb}/include -D_REENTRANT -D_GNU_SOURCE" - LDFLAGS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/" - LDFLAGS_new="${LDFLAGS_new} -L${with_directfb}/src/.libs/" + LIBS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/" + LIBS_new="${LIBS_new} -L${with_directfb}/src/.libs/" CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}" - LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}" + LIBS="${LIBS} ${LIBS_new}" dnl FIXME: too obscure AC_CHECK_HEADER([directfb.h], [ @@ -4467,10 +4482,10 @@ if test "${enable_directfb}" = "yes"; then dnl Restore flags CPPFLAGS="${CPPFLAGS_save}" - LDFLAGS="${LDFLAGS_save}" + LIBS="${LIBS_save}" if test "${have_directfb}" = "true"; then - LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" + LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" CPPFLAGS_mydirectfb="${CPPFLAGS_new}" fi else @@ -4478,13 +4493,13 @@ if test "${enable_directfb}" = "yes"; then AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH}) if test "${DIRECTFB_CONFIG}" != "no"; then CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`" - LDFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --libs`" + LIBS_mydirectfb="`${DIRECTFB_CONFIG} --libs`" have_directfb="true" else dnl Trying with pkg-config PKG_CHECK_MODULES(DIRECTFB, directfb, [ CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}" - LDFLAGS_mydirectfb="${DIRECTFB_LIBS}" + LIBS_mydirectfb="${DIRECTFB_LIBS}" have_directfb="true" ], [have_directfb="false"]) fi @@ -4492,7 +4507,7 @@ if test "${enable_directfb}" = "yes"; then if test "${have_directfb}" = "true"; then VLC_ADD_PLUGINS([directfb]) VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}]) - VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}]) + VLC_ADD_LIBS([directfb],[${LIBS_mydirectfb}]) else AC_MSG_ERROR([cannot find directfb headers and/or libraries ]) fi @@ -4508,7 +4523,7 @@ AC_ARG_ENABLE(ggi, if test "${enable_ggi}" = "yes" then VLC_ADD_PLUGINS([ggi]) - VLC_ADD_LDFLAGS([ggi],[-lggi]) + VLC_ADD_LIBS([ggi],[-lggi]) AC_ARG_WITH(ggi, [ --with-ggi=PATH path to libggi], [ if test "${with_ggi}" != "no" -a -n "${with_ggi}" @@ -4537,7 +4552,7 @@ then CFLAGS="$CFLAGS -I/usr/include/glide" AC_CHECK_HEADER(glide.h,[ VLC_ADD_PLUGINS([glide]) - VLC_ADD_LDFLAGS([glide],[-lglide2x -lm]) + 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]) @@ -4556,7 +4571,7 @@ then if test "${have_aa}" = "true" then VLC_ADD_PLUGINS([aa]) - VLC_ADD_LDFLAGS([aa],[-laa]) + VLC_ADD_LIBS([aa],[-laa]) fi fi @@ -4579,7 +4594,7 @@ then then VLC_ADD_PLUGINS([caca]) VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([caca],[`${CACA_CONFIG} --plugin-libs`]) + VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`]) fi fi @@ -4591,7 +4606,7 @@ AC_ARG_ENABLE(wingdi, if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then VLC_ADD_PLUGINS([wingdi]) - VLC_ADD_LDFLAGS([wingdi],[-lgdi32]) + VLC_ADD_LIBS([wingdi],[-lgdi32]) fi if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGINS([wingdi wingapi]) @@ -4616,7 +4631,7 @@ if test "${enable_oss}" != "no" && then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ VLC_ADD_PLUGINS([oss]) - AC_CHECK_LIB(ossaudio,main,VLC_ADD_LDFLAGS([oss],[-lossaudio])) + AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) ]) fi @@ -4632,7 +4647,7 @@ AC_ARG_ENABLE(esd, then VLC_ADD_PLUGINS([esd]) VLC_ADD_CFLAGS([esd],[`${ESD_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([esd],[`${ESD_CONFIG} --libs`]) + VLC_ADD_LIBS([esd],[`${ESD_CONFIG} --libs`]) fi fi]) @@ -4646,9 +4661,9 @@ AC_ARG_ENABLE(portaudio, VLC_ADD_PLUGINS([portaudio]) VLC_ADD_CXXFLAGS([portaudio],[]) if test "${SYS}" = "mingw32"; then - VLC_ADD_LDFLAGS([portaudio],[-lportaudio -lwinmm -lole32]) + VLC_ADD_LIBS([portaudio],[-lportaudio -lwinmm -lole32]) else - VLC_ADD_LDFLAGS([portaudio],[-lportaudio]) + VLC_ADD_LIBS([portaudio],[-lportaudio]) fi fi]) @@ -4664,7 +4679,7 @@ AC_ARG_ENABLE(arts, then VLC_ADD_PLUGINS([arts]) VLC_ADD_CFLAGS([arts],[`${ARTS_CONFIG} --cflags`]) - VLC_ADD_LDFLAGS([arts],[`${ARTS_CONFIG} --libs `]) + VLC_ADD_LIBS([arts],[`${ARTS_CONFIG} --libs `]) fi fi]) @@ -4685,7 +4700,7 @@ then [snd_pcm_hw_params_get_period_time(0,0,0);], AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) VLC_ADD_PLUGINS([alsa]) - VLC_ADD_LDFLAGS([alsa],[-lasound -lm -ldl]) + VLC_ADD_LIBS([alsa],[-lasound -lm -ldl]) else if test "${enable_alsa}" = "yes"; then AC_MSG_ERROR([Could not find ALSA development headers]) @@ -4701,7 +4716,7 @@ AC_ARG_ENABLE(waveout, if test "${enable_waveout}" != "no"; then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"; then VLC_ADD_PLUGINS([waveout]) - VLC_ADD_LDFLAGS([waveout],[-lwinmm]) + VLC_ADD_LIBS([waveout],[-lwinmm]) fi if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGINS([waveout]) @@ -4828,7 +4843,7 @@ dnl dnl UPnP Plugin (Intel SDK) dnl AC_ARG_ENABLE(upnp, - [ --enable-upnp Intel UPnP SDK (default auto)]) + [ --enable-upnp Intel UPnP SDK (default enabled)]) VLC_ADD_CXXFLAGS([upnp_intel], [ ]) AS_IF([test "x${enable_upnp}" != "xno"], [ @@ -5305,7 +5320,7 @@ AC_ARG_ENABLE(macosx, VLC_ADD_PLUGINS([access_eyetv]) VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) + VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit,-framework,WebKit]) VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] ) fi], @@ -5315,7 +5330,7 @@ AC_ARG_ENABLE(macosx, VLC_ADD_BUILTINS([macosx]) VLC_ADD_BUILTINS([minimal_macosx]) VLC_ADD_LDFLAGS([minimal_macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL]) - VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit]) + VLC_ADD_LDFLAGS([macosx],[-Wl,-framework,IOKit,-framework,Cocoa,-framework,Carbon,-framework,QuickTime,-lobjc,-ObjC,-framework,OpenGL,-framework,AGL,-framework,QTKit,-framework,WebKit]) VLC_ADD_OBJCFLAGS([macosx],[-fobjc-exceptions]) VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions]) ])]) @@ -5340,19 +5355,22 @@ dnl AC_ARG_ENABLE(ncurses, [ --disable-ncurses ncurses interface support (default enabled)], [if test "${enable_ncurses}" != "no"; then - AC_CHECK_HEADERS(ncursesw/curses.h, - [AC_CHECK_LIB( ncursesw, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) - VLC_ADD_LIBS([ncurses],[-lncursesw])]) - ], - [AC_CHECK_HEADER(curses.h, - [AC_CHECK_LIB(ncurses, mvprintw, - [VLC_ADD_PLUGINS([ncurses]) - VLC_ADD_LIBS([ncurses],[-lncurses])] - )] - )] - ) - fi]) + AC_CHECK_HEADER(ncurses.h, + [AC_CHECK_LIB(ncursesw, mvprintw, + [VLC_ADD_PLUGINS([ncurses]) + VLC_ADD_LIBS([ncurses],[-lncursesw]) + AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.]) + ], + [AC_CHECK_LIB( ncurses, mvprintw, + [VLC_ADD_PLUGINS([ncurses]) + VLC_ADD_LIBS([ncurses],[-lncurses])], + [AS_IF([test "x${enable_ncurses}" != "x"], [ + AC_MSG_ERROR([libncurses not found])])] + )] + )] + ) + fi] +) dnl dnl XOSD plugin @@ -5376,6 +5394,18 @@ then fi fi +dnl +dnl Framebuffer (overlay) plugin +dnl +AC_ARG_ENABLE(fbosd, + [ --enable-fbosd fbosd interface support (default disabled)]) +if test "${enable_fbosd}" = "yes" +then + AC_CHECK_HEADERS(linux/fb.h, [ + VLC_ADD_PLUGINS([fbosd]) + ]) +fi + dnl dnl Visualisation plugin dnl @@ -5446,7 +5476,7 @@ then fi else AC_CHECK_HEADERS(goom/goom.h, [ - LDFLAGS="${LDFLAGS_save} ${LDFLAGS_goom}" + LDFLAGS="${LDFLAGS_save} ${LIBS_goom}" AC_CHECK_LIB(goom2, goom_init, [ VLC_ADD_PLUGINS([goom]) VLC_ADD_LIBS([goom],[-lgoom2]) @@ -6030,7 +6060,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" +CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include -I\$(top_builddir)/include" dnl dnl Restore *FLAGS