dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.8.4-svn)
+AC_INIT(vlc,0.8.4-test3)
VERSION_MAJOR="0"
VERSION_MINOR="8"
VERSION_REVISION="4"
-VERSION_EXTRA="svn"
+VERSION_EXTRA="test3"
CONFIGURE_LINE="$0 $*"
CODENAME="Janus"
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-svn)
+AM_INIT_AUTOMAKE(vlc,0.8.4-test3)
AM_CONFIG_HEADER(config.h)
+dnl HA! HA!
+AM_MAINTAINER_MODE
+
dnl
dnl Save *FLAGS
dnl
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LDFLAGS([vlc beos],[-lbe])
VLC_ADD_LDFLAGS([beos],[-lmedia -ltranslation -ltracker -lgame])
- VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet])
+
+ dnl Check for BONE
+ if test -f /boot/beos/system/lib/libbind.so; then
+ VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lbind -lsocket])
+ else
+ VLC_ADD_LDFLAGS([access_file access_ftp access_mms access_output_udp telnet netsync sap ipv4 vlc],[-lnet])
+ fi
dnl Ugly check for Zeta
if test -f /boot/beos/system/lib/libzeta.so; then
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 gl it ja ko nl 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
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([i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
VLC_ADD_PLUGINS([float32_mixer spdif_mixer simple_channel_mixer])
- VLC_ADD_PLUGINS([headphone_channel_mixer normvol equalizer])
+ VLC_ADD_PLUGINS([dolby_surround_decoder headphone_channel_mixer normvol equalizer])
VLC_ADD_PLUGINS([fixed32tofloat32 float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif s16tofloat32 s16tofloat32swab s8tofloat32 u8tofloat32 audio_format])
fi
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
dnl gnomeVFS access module
dnl
AC_ARG_ENABLE(gnomevfs,
- [ --enable-gnomevfs GnomeVFS access module (default enables)])
+ [ --enable-gnomevfs GnomeVFS access module (default enabled)])
if test "${enable_gnomevfs}" != "no"
then
PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0,
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" &&
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],
VLC_ADD_LDFLAGS([mod],[-lmodplug])])
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})
AC_MSG_RESULT(yes)
VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
VLC_ADD_LDFLAGS([x264],[-L${real_x264_tree}])
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_BUILTINS([x264])
VLC_ADD_LDFLAGS([x264],[-lx264])
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_x264} ${THREAD_LIB}"
AC_CHECK_HEADERS(x264.h, [
AC_CHECK_LIB(x264, x264_encoder_open, [
VLC_ADD_PLUGINS([x264])
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,
fi
VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`])
VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
+ if ${WX_CONFIG} --unicode
+ then
+ # wxwidgets should provide the following flags but does not
+ # the following is required to compile for win32
+ VLC_ADD_CXXFLAGS([wxwidgets],[-D_UNICODE -DUNICODE])
+ fi
if test "$have_libcdio" = "yes"
then
VLC_ADD_LDFLAGS([wxwidgets],[$LIBCDIO_LIBS])
projects / vlc / blobdiff