X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=db027c60b089b994112cefb06ed30236f1930392;hb=0fb33f81f077a7a08bef1c74762e202127120d66;hp=bebc4ab284d2e4fb69f01020e036b8a67aabf73a;hpb=758e2cb450a70d7f7cc17911409278a9f7756edc;p=vlc diff --git a/configure.ac b/configure.ac index bebc4ab284..db027c60b0 100644 --- a/configure.ac +++ b/configure.ac @@ -8,6 +8,7 @@ VERSION_EXTRA="svn" CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Grishenko" +COPYRIGHT_YEARS="1996-2008" AC_PREREQ(2.59) dnl this really should be 2.59c AC_CONFIG_SRCDIR(src/libvlc.c) @@ -93,22 +94,18 @@ AC_ARG_WITH(contrib, OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include" OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include" if test $build = $host -o "$PKG_CONFIG_LIBDIR"; then - export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH + export PKG_CONFIG_PATH=${topdir}/extras/contrib/lib/pkgconfig:$PKG_CONFIG_PATH else - export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig + export PKG_CONFIG_LIBDIR=${topdir}/extras/contrib/lib/pkgconfig fi LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib" LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib" -dnl kludge because only the debian package provides a ffmpeg-config - if test -z $with_ffmpeg_config_path; then - with_ffmpeg_config_path=${topdir}/extras/contrib/bin; - fi if test -z $with_live555_tree; then with_live555_tree=${topdir}/extras/contrib/src/live fi if test -z $with_goom_tree; then - with_goom_tree=${topdir}/extras/contrib/src/goom + with_goom_tree=${topdir}/extras/contrib/src/goom fi if test -z $with_mozilla_sdk_path; then with_mozilla_sdk_path=${topdir}/extras/contrib/gecko-sdk @@ -117,7 +114,10 @@ dnl kludge because only the debian package provides a ffmpeg-config with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc fi if test -z $with_libmpeg2_tree; then - with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec + with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec + fi + if test -z $with_a52_tree; then + with_a52_tree=${topdir}/extras/contrib/src/a52dec fi if test ".`uname -s`" = ".Darwin"; then @@ -184,6 +184,10 @@ case "${host_os}" in then echo "" echo "Building with Mac OS X defaults:" + with_macosx_version_min="10.4" + echo " Assuming --with-macosx-version-min=10.4" + enable_macosx="yes" + echo " Assuming --enable-macosx" enable_faad="yes" echo " Assuming --enable-faad" enable_flac="yes" @@ -216,6 +220,52 @@ case "${host_os}" in enable_xvideo="no" echo " Assuming --disable-xvideo" + with_macosx_sdk="" + echo " Compiling with default SDK" + fi + if test ".`uname -p`" = ".i386"; then + dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code + dnl without hacking it a lot, we disable mmx and sse. + dnl (that bug is about ld being unable to handle + dnl text relocation) + save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -dynamiclib -single_module -read_only_relocs suppress" + AC_TRY_LINK( + [int a;], [asm("movq _a,%mm0\n");], + ac_ld_does_not_support_text_reloc=no, + ac_ld_does_not_support_text_reloc=yes) + CFLAGS="$save_cflags" + + if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then + enable_mmx="no" + echo " Assuming --disable-mmx (due to a bug in ld)" + enable_sse="no" + echo " Assuming --disable-sse (due to a bug in ld)" + fi + fi + dnl + dnl Check for Mac OS X SDK settings + dnl + AC_ARG_WITH(macosx-sdk, + [ --with-macosx-sdk=DIR compile using the SDK in DIR]) + if test "${with_macosx_sdk}" != "" ; then + CC="${CC} -isysroot ${with_macosx_sdk}" + CXX="${CXX} -isysroot ${with_macosx_sdk}" + OBJC="${OBJC} -isysroot ${with_macosx_sdk}" + LD="${LD} -syslibroot ${with_macosx_sdk}" + fi + AC_ARG_WITH(macosx-version-min, + [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above]) + if test "${with_macosx_version_min}" != "" ; then + CC="${CC} -mmacosx-version-min=${with_macosx_version_min}" + CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}" + OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}" + LD="${LD} -macosx_version_min=${with_macosx_version_min}" + CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CFLAGS="${CFLAGS_save}" + CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; CXXFLAGS="${CXXFLAGS_save}" + OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"; OBJCFLAGS="${OBJCFLAGS_save}" + MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min} + export MACOSX_DEPLOYMENT_TARGET fi ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) @@ -245,7 +295,7 @@ case "${host_os}" in VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LIBS([activex mozilla],[-lgdi32]) VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm]) - VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler],[-lws2_32]) + VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler lua],[-lws2_32]) fi if test "${SYS}" = "mingwce"; then # add ws2 for closesocket, select, recv @@ -336,23 +386,6 @@ m4_defun([AC_DEPLIBS_CHECK_METHOD],[]) lt_cv_deplibs_check_method=pass_all -dnl -dnl Check for Mac OS X SDK settings -dnl -AC_ARG_WITH(macosx-sdk, - [ --with-macosx-sdk compile with the Mac OS X 10.4u SDK],[], with_macosx_sdk=no) -if test "${with_macosx_sdk}" != "no" ; then - CC="${CC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - CXX="${CXX} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - OBJC="${OBJC} -isysroot /Developer/SDKs/MacOSX10.4u.sdk" - LD="${LD} -syslibroot /Developer/SDKs/MacOSX10.4u.sdk" - CFLAGS_save="${CFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CFLAGS="${CFLAGS_save}" - CXXFLAGS_save="${CXXFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; CXXFLAGS="${CXXFLAGS_save}" - OBJCFLAGS_save="${OBJCFLAGS_save} -DMACOSX_DEPLOYMENT_TARGET=10.4 -mmacosx-version-min=10.4"; OBJCFLAGS="${OBJCFLAGS_save}" - MACOSX_DEPLOYMENT_TARGET="10.4" - export MACOSX_DEPLOYMENT_TARGET -fi - dnl dnl Gettext stuff dnl @@ -793,7 +826,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]) @@ -896,8 +935,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, @@ -1204,12 +1247,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]) @@ -1220,16 +1262,25 @@ VLC_ADD_PLUGINS([packetizer_mpegvideo packetizer_h264]) VLC_ADD_PLUGINS([packetizer_mpeg4video packetizer_mpeg4audio]) VLC_ADD_PLUGINS([packetizer_vc1]) +ALIASES="${ALIASES} cvlc" + +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([i420_yuy2 i422_yuy2 i420_ymga i422_i420 yuy2_i422 yuy2_i420 chroma_chain]) VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler]) VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer]) VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer param_eq]) VLC_ADD_PLUGINS([converter_float a52tospdif dtstospdif audio_format]) + ALIASES="${ALIASES} rvlc" fi dnl @@ -1478,7 +1529,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" @@ -1508,16 +1559,20 @@ AS_IF([test "${CFLAGS_TUNING}"], dnl dnl x86 accelerations dnl -if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64" -then +AC_ARG_ENABLE(mmx, +[ --disable-mmx disable MMX optimizations (default enabled on x86)], +[ if test "${enable_mmx}" = "yes"; then ARCH="${ARCH} mmx"; + VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], +[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "x86" -o "${host_cpu}" = "i386" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "x86_64"; then ARCH="${ARCH} mmx" - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) -fi -if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64" -then - ARCH="${ARCH} sse sse2" - VLC_ADD_PLUGINS([${ACCEL_MODULES}]) -fi + VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) + +AC_ARG_ENABLE(sse, +[ --disable-sse disable SSE (1 and 2) optimizations (default enabled on i686 and x86_64)], +[ if test "${enable_sse}" = "yes"; then ARCH="${ARCH} sse sse2"; + VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ], +[ if test "${host_cpu}" = "i686" -o "${host_cpu}" = "x86_64"; then ARCH="${ARCH} sse sse2"; + VLC_ADD_PLUGINS([${ACCEL_MODULES}]) fi ]) dnl dnl Memory usage @@ -2022,7 +2077,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 @@ -2043,7 +2098,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 @@ -2058,7 +2113,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 @@ -2276,7 +2331,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 @@ -2302,7 +2357,7 @@ then fi dnl -dnl Video4Linux plugin +dnl Video4Linux2 plugin dnl AC_ARG_ENABLE(v4l2, [ --enable-v4l2 Video4Linux2 input support (default disabled)]) @@ -2315,6 +2370,19 @@ then VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) fi + AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false") + if test "${have_v4l2_alsa}" = "true" + then + CFLAGS="${CFLAGS_save}" + AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API + #include ], + [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_LDFLAGS([v4l2],[-lasound -lm -ldl]) + AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.) + fi + CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ VLC_ADD_PLUGINS([v4l2]) @@ -2827,7 +2895,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]) @@ -2840,7 +2908,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, [ @@ -2869,8 +2937,8 @@ AS_IF([test "${enable_id3tag}" != "no"], [ 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 we try to find ffmpeg using : 1- given tree, 2- pkg-config +dnl 3- default place, AC_ARG_ENABLE(ffmpeg, [ --enable-ffmpeg ffmpeg codec (default enabled)]) @@ -2883,21 +2951,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]) ]) @@ -2929,35 +2997,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], + [ --with-ffmpeg-x264 specify if ffmpeg has been compiled with libx264 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-x264 specify if ffmpeg has been compiled with libamrnb support], + [ --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 @@ -2983,7 +3051,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 @@ -2993,65 +3061,46 @@ 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}" + AS_IF([test -n "${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 - -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)], - [ if test "${with_ffmpeg_config_path}" != "no" - then - FFMPEG_PATH="${with_ffmpeg_config_path}" - fi ]) - AC_PATH_PROG(FFMPEG_CONFIG, ffmpeg-config, no, ${FFMPEG_PATH}) - if test "${FFMPEG_CONFIG}" != "no" - then - 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(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] ) - VLC_ADD_PLUGINS([ffmpeg]) - if test "${enable_sout}" != "no" -a "${enable_switcher}" = "yes"; then - VLC_ADD_PLUGINS([stream_out_switcher]) + + if test -f "${real_ffmpeg_tree}/libavformat/libavformat.a"; then + AC_DEFINE(HAVE_LIBAVFORMAT_TREE, 1, [Define if you have ffmpeg's libavformat.]) + VLC_ADD_LIBS([ffmpeg],[-L${real_ffmpeg_tree}/libavformat -lavformat -lz]) + VLC_ADD_CPPFLAGS([ffmpeg],[-I${real_ffmpeg_tree}/libavformat]) 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 +else + dnl Trying with pkg-config PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat], @@ -3060,8 +3109,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}]) @@ -3084,21 +3133,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) @@ -3116,11 +3167,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]) @@ -3134,7 +3184,6 @@ dnl Trying with pkg-config CPPFLAGS="${CPPFLAGS_save}" ]) fi - fi fi dnl @@ -3212,7 +3261,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, [ @@ -3221,7 +3270,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 @@ -3260,7 +3309,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, [ @@ -3359,7 +3408,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}" + LDFLAGS="${LDFLAGS_save} ${LIBS_a52tofloat32}" AC_CHECK_LIB(a52, a52_free, [ VLC_ADD_BUILTINS([a52tofloat32]) VLC_ADD_CPPFLAGS([a52tofloat32],[-DUSE_A52DEC_TREE]) @@ -3367,7 +3416,7 @@ then ],[ if test -f ${real_a52_tree}/liba52/.libs/liba52.a then - AC_MSG_ERROR([make sure you have at least a52dec-0.7.3]) + AC_MSG_ERROR([make sure you have at least a52dec-0.7.3 ($real_a52_tree)]) else AC_MSG_ERROR([the specified tree hasn't been compiled]) fi @@ -3387,7 +3436,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]) @@ -3637,7 +3686,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]) ], @@ -3701,7 +3750,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++]) ],[ @@ -3720,7 +3769,7 @@ AC_CHECK_HEADERS(png.h, [ AC_CHECK_LIB(png, png_set_rows, [ VLC_ADD_LIBS([png],[-lpng -lz]) VLC_ADD_PLUGINS([png]) - VLC_ADD_PLUGINS([osdmenu]) + VLC_ADD_PLUGINS([osdmenu osd_parser]) AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])], [],[-lz]) LDFLAGS="${LDFLAGS_save}" @@ -3751,7 +3800,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]) @@ -3764,7 +3813,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]) @@ -3783,7 +3832,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) @@ -4199,8 +4248,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 @@ -4221,10 +4270,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]) ],[ @@ -4256,7 +4305,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)]) @@ -4311,10 +4360,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 @@ -4342,7 +4391,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 @@ -4368,15 +4417,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}) @@ -4384,7 +4433,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) @@ -4424,7 +4473,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 @@ -4440,18 +4489,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], [ @@ -4464,10 +4513,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 @@ -4475,13 +4524,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 @@ -4489,7 +4538,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 @@ -4505,7 +4554,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}" @@ -4534,7 +4583,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]) @@ -4553,7 +4602,7 @@ then if test "${have_aa}" = "true" then VLC_ADD_PLUGINS([aa]) - VLC_ADD_LDFLAGS([aa],[-laa]) + VLC_ADD_LIBS([aa],[-laa]) fi fi @@ -4576,7 +4625,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 @@ -4588,7 +4637,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]) @@ -4613,7 +4662,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 @@ -4629,7 +4678,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]) @@ -4643,9 +4692,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]) @@ -4661,7 +4710,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]) @@ -4682,7 +4731,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]) @@ -4698,7 +4747,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]) @@ -4825,7 +4874,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"], [ @@ -5161,9 +5210,9 @@ AS_IF([test "${enable_qt4}" != "no" && AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin) ], AS_IF([test "${enable_qt4}" = "yes"],[ - AC_MSG_ERROR(QT4 library not found) + AC_MSG_ERROR(QT4 library not found) ],[ - AC_MSG_WARN(QT4 library not found) + AC_MSG_WARN(QT4 library not found) ]) ) ]) @@ -5291,32 +5340,32 @@ AC_ARG_ENABLE(opie, fi]) dnl -dnl MacOS X module +dnl MacOS X video output/gui modules dnl -ORIGCFLAGS=$CFLAGS -CFLAGS="$CFLAGS -x objective-c" AC_ARG_ENABLE(macosx, - [ --enable-macosx MacOS X support (default enabled on MacOS X)], - [if test "${enable_macosx}" = "yes" - then - 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_OBJCFLAGS( [macosx],[-fobjc-exceptions] ) - VLC_ADD_OBJCFLAGS( [minimal_macosx],[-fobjc-exceptions] ) - fi], - [AC_CHECK_HEADERS(Cocoa/Cocoa.h, - [VLC_ADD_PLUGINS([access_eyetv]) - VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) - 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_OBJCFLAGS([macosx],[-fobjc-exceptions]) - VLC_ADD_OBJCFLAGS([minimal_macosx],[-fobjc-exceptions]) - ])]) -CFLAGS=$ORIGCFLAGS + [ --enable-macosx MacOS X support (default enabled on MacOS X)]) +if test "x${enable_macosx}" = "xyes" +then + VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,CoreFoundation]) + VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,Cocoa]) + VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL]) + VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon]) + VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QuickTime]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit]) + VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit]) + VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore]) + VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer], [-fobjc-exceptions] ) + + VLC_ADD_PLUGINS([access_eyetv]) + VLC_ADD_BUILTINS([macosx minimal_macosx]) + + ORIGCFLAGS=$CFLAGS + CFLAGS="$CFLAGS -x objective-c" + AC_CHECK_HEADER(QuartzCore/CALayer.h, [VLC_ADD_BUILTINS([opengllayer])]) + CFLAGS=$ORIGCFLAGS +fi dnl dnl QNX RTOS module @@ -5337,19 +5386,24 @@ 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]) + ALIASES="${ALIASES} nvlc" + AC_DEFINE([HAVE_NCURSESW], 1, [Define to 1 if you have libncursesw.]) + ], + [AC_CHECK_LIB( ncurses, mvprintw, + [VLC_ADD_PLUGINS([ncurses]) + ALIASES="${ALIASES} nvlc" + VLC_ADD_LIBS([ncurses],[-lncurses])], + [AS_IF([test "x${enable_ncurses}" != "x"], [ + AC_MSG_ERROR([libncurses not found])])] + )] + )] + ) + fi] +) dnl dnl XOSD plugin @@ -5373,6 +5427,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 @@ -5443,7 +5509,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]) @@ -5523,7 +5589,7 @@ dnl libgcrypt dnl AC_ARG_ENABLE(libgcrypt, [ --enable-libgcrypt libgcrypts support (default enabled)]) -if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no"i +if test "${enable_libgcrypt}" != "no" -a "${enable_gnutls}" != "no" then dnl Workaround for cross-compiling since AM_PATH_LIBGRYPT doesn't dectect dnl it and looks for libgcrypt headers in the wrong place. @@ -5536,6 +5602,20 @@ then fi AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"]) +dnl +dnl update checking system +dnl +AC_ARG_ENABLE(update-check, + [ --enable-update-check update checking system (default disabled)]) +if test "${enable_update_check}" = "yes" +then + if test "${have_libgcrypt}" != "yes" + then + AC_MSG_ERROR([libgcrypt is required for update checking system]) + fi + VLC_ADD_LIBS([libvlc], [-lgcrypt]) + AC_DEFINE([UPDATE_CHECK], [1], [Define if you want to use the VLC update mechanism]) +fi dnl dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling @@ -5842,7 +5922,7 @@ fi AC_LANG_POP(C++) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) - dnl Tests for Osso and Xsp +dnl Tests for Osso and Xsp if test "${enable_x11}" != "no" && (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || test "${enable_x11}" = "yes"); then @@ -6001,7 +6081,8 @@ dnl dnl Stuff used by the program dnl AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string]) -AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2007 the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string]) +AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years]) AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number]) AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number]) @@ -6015,19 +6096,12 @@ AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) -dnl New definitions with value matching 0.9.0 release -module_symbol="0_9_0b" -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}" -AC_SUBST(VLC_ENTRY) - dnl 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 @@ -6136,6 +6210,7 @@ AC_CONFIG_FILES([ modules/misc/notify/Makefile modules/misc/testsuite/Makefile modules/misc/playlist/Makefile + modules/misc/osd/Makefile modules/misc/xml/Makefile modules/misc/probe/Makefile modules/mux/Makefile @@ -6199,4 +6274,11 @@ with \`./vlc-config --list plugin'. You can tune the compiler flags in vlc-config. To build vlc and its plugins, type \`./compile' or \`make'. " - +if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then + echo "" + echo "Warning: Due to a bug in ld, mmx/sse support has been" + echo " turned off." + echo " FFmpeg will be REALLY slow." + echo " VLC WILL NOT PERFORM AS EXPECTED." + echo "" +fi