dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.8.4-test1)
+AC_INIT(vlc,0.8.5-svn)
VERSION_MAJOR="0"
VERSION_MINOR="8"
VERSION_REVISION="4"
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.8.4-test1)
+AM_INIT_AUTOMAKE(vlc,0.8.5-svn)
AM_CONFIG_HEADER(config.h)
dnl HA! HA!
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru tr zh_TW"
+ALL_LINGUAS="ca da de en_GB es fr it ja ko nl pt_BR ro ru 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
VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264 goom],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer vlc freetype],[-lm])
+ VLC_ADD_LDFLAGS([ffmpeg ffmpegaltivec stream_out_transrate i420_rgb faad twolame equalizer vlc freetype mpc],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
x_libraries="/usr/X11R6/lib"
fi
+dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal.
+
+PKG_PROG_PKG_CONFIG()
+
dnl Check for hal
AC_ARG_ENABLE(hal,
[ --enable-hal Linux HAL services discovery (default enabled)])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
VLC_ADD_PLUGINS([playlist export sgimb m3u nsc xtag])
-VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo])
+VLC_ADD_PLUGINS([i420_rgb rawvideo blend scale image logo magnify])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au ty voc xa nuv])
VLC_ADD_PLUGINS([access_directory access_file access_udp access_tcp])
VLC_ADD_PLUGINS([access_http access_mms access_ftp ipv4])
if test "${SYS}" != "mingwce"; then
dnl VLC_ADD_PLUGINS([externrun])
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
- VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq shout sap fake])
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake])
VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
dnl There are several possible cases:
dnl - OS X PPC, gcc 4.x: use -mpim-altivec, don't need <altivec.h>
dnl - OS X PPC, gcc 3.x: need -faltivec, don't need <altivec.h>
-dnl - Linux PPC, gcc 4.x: need <altivec.h> which itself requires -maltivec
+dnl - Linux PPC, gcc 3.4, 4.x: need <altivec.h> which requires -maltivec
dnl - Linux PPC, gcc 3.3: need <altivec.h> and -maltivec -mabi=altivec
dnl - Linux PPC, gcc 3.x: need <altivec.h> and -fvec
dnl - Others: test should fail
VLC_ADD_LDFLAGS([ipv6 vlc],[-lresolv])])
])
-AS_IF([test "${have_ipv6}" == "yes"], [
+AS_IF([test "${have_ipv6}" = "yes"], [
AC_DEFINE(HAVE_INET_PTON, 1, [Define to 1 if you have inet_pton().])])
if test "${SYS}" != "nto" &&
[ --enable-ogg Ogg demux support (default enabled)])
if test "${enable_ogg}" != "no"
then
- AC_CHECK_HEADERS(ogg/ogg.h, [
- AC_CHECK_LIB( ogg, oggpack_read, [
+ AC_ARG_WITH(ogg-tree,
+ [ --with-ogg-tree=PATH ogg tree for static linking])
+ if test -n "${with_ogg_tree}"
+ then
+ AC_MSG_CHECKING(for libogg.a in ${with_ogg_tree})
+ real_ogg_tree="`cd ${with_ogg_tree} 2>/dev/null && pwd`"
+ if test -z "${real_ogg_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_ogg_tree}])
+ fi
+ if test -f "${real_ogg_tree}/src/.libs/libogg.a"
+ then
+ dnl Use a custom ogg
+ AC_MSG_RESULT(${real_ogg_tree}/src/.libs/libogg.a)
VLC_ADD_PLUGINS([ogg])
if test "${enable_sout}" != "no"; then
VLC_ADD_PLUGINS([mux_ogg])
fi
- VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
- ],[])
+ VLC_ADD_LDFLAGS([ogg mux_ogg speex vorbis],[${real_ogg_tree}/src/.libs/libogg.a])
+ VLC_ADD_CFLAGS([ogg mux_ogg speex vorbis],[-I${real_ogg_tree}/include])
+ else
+ dnl The given ogg wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_ogg_tree}/src/.libs/libogg.a, make sure you compiled ogg in ${with_ogg_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(ogg/ogg.h, [
+ AC_CHECK_LIB( ogg, oggpack_read, [
+ VLC_ADD_PLUGINS([ogg])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_PLUGINS([mux_ogg])
+ fi
+ VLC_ADD_LDFLAGS([ogg mux_ogg],[-logg])])
+ ],[])
+ fi
fi
dnl
if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ebml/EbmlVersion.h, [
- AC_MSG_CHECKING(for libebml version >= 0.7.3)
+ AC_MSG_CHECKING(for libebml version >= 0.7.6)
AC_EGREP_CPP(yes,
[#include <ebml/EbmlVersion.h>
#ifdef LIBEBML_VERSION
- #if LIBEBML_VERSION >= 0x000703
+ #if LIBEBML_VERSION >= 0x000706
yes
#endif
#endif],
[ --enable-mod Mod demux support (default enabled)])
if test "${enable_mod}" != "no"
then
- AC_CHECK_HEADERS(libmodplug/modplug.h, [
- VLC_ADD_PLUGINS([mod])
- VLC_ADD_CXXFLAGS([mod],[])
- VLC_ADD_LDFLAGS([mod],[-lmodplug])])
+ AC_ARG_WITH(mod-tree,
+ [ --with-mod-tree=PATH mod tree for static linking])
+ if test -n "${with_mod_tree}"
+ then
+ AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
+ real_mod_tree="`cd ${with_mod_tree} 2>/dev/null && pwd`"
+ if test -z "${real_mod_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_mod_tree}])
+ fi
+ if test -f "${real_mod_tree}/src/.libs/libmodplug.a"
+ then
+ dnl Use a custom mod
+ AC_MSG_RESULT(${real_mod_tree}/src/.libs/libmodplug.a)
+ VLC_ADD_PLUGINS([mod])
+ VLC_ADD_LDFLAGS([mod],[${real_mod_tree}/src/.libs/libmodplug.a])
+ VLC_ADD_CFLAGS([mod],[-I${real_mod_tree}/include])
+ else
+ dnl The given mod wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(libmodplug/modplug.h, [
+ VLC_ADD_PLUGINS([mod])
+ VLC_ADD_CXXFLAGS([mod],[])
+ VLC_ADD_LDFLAGS([mod],[-lmodplug])])
+ fi
+fi
+
+dnl
+dnl mpc demux plugin
+dnl
+AC_ARG_ENABLE(mpc,
+ [ --enable-mpc Mpc demux support (default enabled)])
+if test "${enable_mpc}" != "no"
+then
+ AC_CHECK_HEADERS(mpcdec/mpcdec.h, [
+ VLC_ADD_PLUGINS([mpc])
+ VLC_ADD_LDFLAGS([mpc],[-lmpcdec])])
fi
+
dnl
dnl Codec plugins
dnl
dnl
dnl ffmpeg decoder/demuxer plugin
dnl
+dnl we try to find ffmpeg using : 1- ffmpeg-config, 2- pkg-config
+dnl 3- default place, 4- given tree
+
AC_ARG_ENABLE(ffmpeg,
[ --enable-ffmpeg ffmpeg codec (default enabled)])
if test "${enable_ffmpeg}" != "no"
VLC_ADD_LDFLAGS([ffmpeg stream_out_switcher],[`${FFMPEG_CONFIG} --plugin-libs avcodec avformat postproc`])
else
- AC_ARG_WITH(ffmpeg-mp3lame,
+
+dnl Those options have to be here because the .pc can be bogus for ffmpeg previous nov 05
+
+ AC_ARG_WITH(ffmpeg-mp3lame,
[ --with-ffmpeg-mp3lame specify if ffmpeg has been compiled with mp3lame support],
[
- VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame]) ])
+ if test "$with_ffmpeg_mp3lame" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lmp3lame])
+ fi
+ ])
AC_ARG_WITH(ffmpeg-faac,
[ --with-ffmpeg-faac specify if ffmpeg has been compiled with faac support],
[
- VLC_ADD_LDFLAGS([ffmpeg],[-lfaac]) ])
+ if test "$with_ffmpeg_faac" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lfaac])
+ fi])
AC_ARG_WITH(ffmpeg-dts,
[ --with-ffmpeg-dts specify if ffmpeg has been compiled with dts support],
[
- VLC_ADD_LDFLAGS([ffmpeg],[-ldts]) ])
+ if test "$with_ffmpeg_dts" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-ldts])
+ fi])
AC_ARG_WITH(ffmpeg-zlib,
[ --with-ffmpeg-zlib specify if ffmpeg has been compiled with zlib support],
[
- VLC_ADD_LDFLAGS([ffmpeg],[-lz]) ])
+ if test "$with_ffmpeg_zlib" = "yes"; then
+ VLC_ADD_LDFLAGS([ffmpeg],[-lz])
+ fi])
- AC_ARG_WITH(ffmpeg-tree,
- [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
+dnl Trying with pkg-config
+ PKG_CHECK_MODULES(FFMPEG,[libavcodec, libavformat],
+ [
+ AC_CHECK_HEADERS(ffmpeg/avcodec.h)
+ AC_CHECK_HEADERS(postproc/postprocess.h)
+ VLC_ADD_BUILTINS([ffmpeg])
+ if test "${enable_sout}" != "no"; then
+ VLC_ADD_BUILTINS([stream_out_switcher])
+ fi
+ VLC_ADD_CFLAGS([ffmpeg stream_out_switcher],[${FFMPEG_CFLAGS}])
+ VLC_ADD_LDFLAGS([ffmpeg],[${FFMPEG_LIBS}])
+ ],[
+
dnl
dnl test for !(--with-ffmpeg-tree)
dnl
AC_CHECK_LIB(avcodec, avcodec_init, [
VLC_ADD_BUILTINS([ffmpeg])
+
+
VLC_ADD_LDFLAGS([ffmpeg],[-lavcodec])
if test "${enable_sout}" != "no"; then
VLC_ADD_BUILTINS([stream_out_switcher])
VLC_ADD_CPPFLAGS([ffmpeg stream_out_switcher],[-I${real_ffmpeg_tree}/libavformat])
fi
fi
+ ])
+ AC_ARG_WITH(ffmpeg-tree,
+ [ --with-ffmpeg-tree=PATH ffmpeg tree for static linking])
+
fi
fi
dnl
AC_ARG_ENABLE(ffmpegaltivec,
[ --enable-ffmpegaltivec ffmpegaltivec codec (DO NOT USE)])
-if test "${enable_ffmpegaltivec}" == "yes"
+if test "${enable_ffmpegaltivec}" = "yes"
then
if test "${with_ffmpeg_tree}" != "no" -a -n "${with_ffmpeg_tree}"; then
AC_MSG_CHECKING(for libavcodecaltivec.a in ${with_ffmpeg_tree})
[ --enable-flac flac decoder support (default disabled)])
if test "${enable_flac}" = "yes"
then
- AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
- VLC_ADD_LDFLAGS([flacdec],[-lFLAC])
- ],[])
+ AC_ARG_WITH(flac-tree,
+ [ --with-flac-tree=PATH flac tree for static linking])
+ if test -n "${with_flac_tree}"
+ then
+ AC_MSG_CHECKING(for libFLAC.a in ${with_flac_tree})
+ real_flac_tree="`cd ${with_flac_tree} 2>/dev/null && pwd`"
+ if test -z "${real_flac_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_flac_tree}])
+ fi
+ if test -f "${real_flac_tree}/src/libFLAC/.libs/libFLAC.a"
+ then
+ dnl Use a custom flac
+ AC_MSG_RESULT(${real_flac_tree}/src/libFLAC/.libs/libFLAC.a)
+ VLC_ADD_LDFLAGS([flacdec],[${real_flac_tree}/src/libFLAC/.libs/libFLAC.a])
+ VLC_ADD_CFLAGS([flacdec],[-I${real_flac_tree}/include])
+ AC_DEFINE(HAVE_FLAC_STREAM_DECODER_H, 1, [Define if you have FLAC])
+ else
+ dnl The given flac wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_flac_tree}/src/libFLAC/.libs/libFLAC.a, make sure you compiled flac in ${with_flac_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
+ VLC_ADD_LDFLAGS([flacdec],[-lFLAC])
+ ],[])
+ fi
fi
dnl
[ --enable-vorbis Vorbis decoder support (default enabled)])
if test "${enable_vorbis}" != "no"
then
- AC_CHECK_HEADERS(vorbis/codec.h, [
- VLC_ADD_PLUGINS([vorbis])
- VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
+ AC_ARG_WITH(vorbis-tree,
+ [ --with-vorbis-tree=PATH vorbis tree for static linking])
+ if test -n "${with_vorbis_tree}"
+ then
+ AC_MSG_CHECKING(for libvorbis.a in ${with_vorbis_tree})
+ real_vorbis_tree="`cd ${with_vorbis_tree} 2>/dev/null && pwd`"
+ if test -z "${real_vorbis_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_vorbis_tree}])
+ fi
+ if test -f "${real_vorbis_tree}/lib/.libs/libvorbis.a"
+ then
+ dnl Use a custom vorbis
+ AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a)
+ VLC_ADD_PLUGINS([vorbis])
+ VLC_ADD_LDFLAGS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a])
+ VLC_ADD_CFLAGS([vorbis],[-I${real_vorbis_tree}/include])
+ else
+ dnl The given vorbis wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_vorbis_tree}/lib/.libs/libvorbis.a, make sure you compiled vorbis in ${with_vorbis_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(vorbis/codec.h, [
+ VLC_ADD_PLUGINS([vorbis])
+ VLC_ADD_LDFLAGS([vorbis],[-lvorbis -logg]) ],[])
- AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
- VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc]) ],[])
+ AC_CHECK_HEADERS(vorbis/vorbisenc.h, [
+ VLC_ADD_LDFLAGS([vorbis],[-lvorbisenc]) ],[])
+ fi
fi
dnl
[ --enable-speex Speex decoder support (default enabled)])
if test "${enable_speex}" != "no"
then
- AC_CHECK_HEADERS(speex/speex.h, [
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_speex}"
- AC_CHECK_LIB(speex, speex_decode_int, [
+ AC_ARG_WITH(speex-tree,
+ [ --with-speex-tree=PATH speex tree for static linking])
+ if test -n "${with_speex_tree}"
+ then
+ AC_MSG_CHECKING(for libspeex.a in ${with_speex_tree})
+ real_speex_tree="`cd ${with_speex_tree} 2>/dev/null && pwd`"
+ if test -z "${real_speex_tree}"
+ then
+ dnl The given directory can't be found
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot cd to ${with_speex_tree}])
+ fi
+ if test -f "${real_speex_tree}/libspeex/.libs/libspeex.a"
+ then
+ dnl Use a custom speex
+ AC_MSG_RESULT(${real_speex_tree}/libspeex/.libs/libspeex.a)
VLC_ADD_PLUGINS([speex])
- VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
- [ AC_MSG_RESULT([no])
- AC_MSG_WARN([Your libspeex is too old, please get the development
- version.]) ],[])
- LDFLAGS="${LDFLAGS_save}"
- ],[])
+ VLC_ADD_LDFLAGS([speex],[${real_speex_tree}/libspeex/.libs/libspeex.a])
+ VLC_ADD_CFLAGS([speex],[-I${real_speex_tree}/include])
+ else
+ dnl The given speex wasn't built
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([cannot find ${real_speex_tree}/libspeex/.libs/libspeex.a, make sure you compiled speex in ${with_speex_tree}])
+ fi
+ else
+ AC_CHECK_HEADERS(speex/speex.h, [
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_speex}"
+ AC_CHECK_LIB(speex, speex_decode_int, [
+ VLC_ADD_PLUGINS([speex])
+ VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
+ [ AC_MSG_RESULT([no])
+ AC_MSG_WARN([Your libspeex is too old, please get the development
+ version.]) ],[])
+ LDFLAGS="${LDFLAGS_save}"
+ ],[])
+ fi
fi
dnl
dnl
AC_ARG_ENABLE(svg,
[ --enable-svg SVG support (default disabled)])
-if test "${enable_svg}" == "yes"
+if test "${enable_svg}" = "yes"
then
PKG_CHECK_MODULES(SVG,
librsvg-2.0 >= 2.5.0,
AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH})
if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
then
- if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null
+ if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
then
- AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.6.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
+ AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
fi
AC_LANG_PUSH(C++)
# Turn this error:
projects / vlc / blobdiff