dnl Autoconf settings for vlc
dnl $Id$
-AC_INIT(vlc,0.8.1-svn)
+AC_INIT(vlc,0.8.2-svn)
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.1-svn)
+AM_INIT_AUTOMAKE(vlc,0.8.2-svn)
AM_CONFIG_HEADER(config.h)
dnl
dnl
dnl Gettext stuff
dnl
-ALL_LINGUAS="de en_GB es fr hu it ja nl no pl pt_BR ru sv"
+ALL_LINGUAS="da de en_GB es fr hu it ja nl no pl pt_BR ru sv"
AM_GNU_GETTEXT_VERSION(0.11.5)
AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
if test "${SYS}" != "mingw32"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LDFLAGS([adjust distort a52tofloat32 dtstofloat32 x264],[-lm])
+ 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 toolame equalizer vlc],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
- VLC_ADD_LDFLAGS([headphone_channel_mixer normvol],[-lm])
+ VLC_ADD_LDFLAGS([headphone_channel_mixer normvol speex],[-lm])
])
fi # end "${SYS}" != "mingw32"
VLC_ADD_PLUGINS([trivial_mixer spdif_mixer float32_mixer])
VLC_ADD_PLUGINS([aout_file equalizer])
VLC_ADD_PLUGINS([i420_rgb i420_yuy2 i422_yuy2 i420_ymga])
-VLC_ADD_PLUGINS([id3 playlist export sgimb])
-VLC_ADD_PLUGINS([rawvideo blend scale time marq])
+VLC_ADD_PLUGINS([image])
+VLC_ADD_PLUGINS([id3 playlist export sgimb m3u xtag])
+VLC_ADD_PLUGINS([rawvideo blend scale time marq logo])
VLC_ADD_PLUGINS([wav araw subtitle vobsub adpcm a52sys dtssys au])
VLC_ADD_PLUGINS([access_file access_udp access_tcp access_http ipv4 access_mms])
VLC_ADD_PLUGINS([access_ftp access_directory sap http])
if test "${enable_cddax}" != "no"
then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.70,
+ PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.71,
[enable_cddax="no"
AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
HAVE_CDDAX=no])
if test "$enable_libcddb" != "no"; then
- PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
+ PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [
HAVE_LIBCDDB=yes
AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
dnl if test "${enable_vcdx}" != "no"
dnl then
-dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
+dnl PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
dnl [enable_vcd="no"
dnl AC_DEFINE(HAVE_VCDX, [],
dnl [Define for the VCD plugin using libcdio/libvcdinfo])
fi
fi
-dnl dnl
-dnl dnl xvid decoder plugin
-dnl dnl
-dnl AC_ARG_ENABLE(xvid,
-dnl [ --enable-xvid xvid codec (default disabled)])
-dnl if test "${enable_xvid}" = "yes"
-dnl then
-dnl AC_ARG_WITH(xvid,
-dnl [ --with-xvid=PATH path to xvid installation],[],[])
-dnl if test "${with_xvid}" != "no" -a -n "${with_xvid}"
-dnl then
-dnl VLC_ADD_CPPFLAGS([xvid],[-I${with_xvid}/include])
-dnl VLC_ADD_LDFLAGS([xvid],[-L${with_xvid}/lib])
-dnl fi
-dnl
-dnl AC_ARG_WITH(xvid-tree,
-dnl [ --with-xvid-tree=PATH xvid tree for static linking])
-dnl if test -n "${with_xvid_tree}"
-dnl then
-dnl AC_MSG_CHECKING(for libxvidcore.a in ${with_xvid_tree})
-dnl real_xvid_tree="`cd ${with_xvid_tree} 2>/dev/null && pwd`"
-dnl if test -z "${real_xvid_tree}"
-dnl then
-dnl dnl The given directory can't be found
-dnl AC_MSG_RESULT(no)
-dnl AC_MSG_ERROR([cannot cd to ${with_xvid_tree}])
-dnl fi
-dnl if test -f "${real_xvid_tree}/build/generic/libxvidcore.a"
-dnl then
-dnl dnl Use a custom xvid
-dnl AC_MSG_RESULT(${real_xvid_tree}/build/generic/libxvidcore.a)
-dnl VLC_ADD_BUILTINS([xvid])
-dnl VLC_ADD_LDFLAGS([xvid],[-L${real_xvid_tree}/build/generic -lxvidcore])
-dnl VLC_ADD_CPPFLAGS([xvid],[-I${real_xvid_tree}/src])
-dnl else
-dnl dnl The given libxvidcore wasn't built
-dnl AC_MSG_RESULT(no)
-dnl AC_MSG_ERROR([cannot find ${real_xvid_tree}/build/generic/libxvidcore.a, make sure you compiled libxvidcore in ${with_xvid_tree}])
-dnl fi
-dnl else
-dnl CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xvid}"
-dnl LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xvid}"
-dnl AC_CHECK_HEADERS(xvid.h, ,
-dnl [ AC_MSG_ERROR([Cannot find development headers for libxvidcore...]) ])
-dnl AC_CHECK_LIB(xvidcore, xvid_init, [
-dnl VLC_ADD_PLUGINS([xvid])
-dnl VLC_ADD_LDFLAGS([xvid],[-lxvidcore]) ],
-dnl [ AC_MSG_ERROR([Cannot find libxvidcore library...]) ])
-dnl LDFLAGS="${LDFLAGS_save}"
-dnl CPPFLAGS="${CPPFLAGS_save}"
-dnl fi
-dnl fi
-
dnl
dnl QuickTime plugin
dnl
fi
fi
-dnl dnl
-dnl dnl DV plugin
-dnl dnl
-dnl AC_ARG_ENABLE(dv,
-dnl [ --enable-dv DV decoder support (deprecated in favor of ffmpeg) (default disabled)])
-dnl if test "${enable_dv}" = "yes"
-dnl then
-dnl AC_CHECK_HEADERS(libdv/dv.h, [
-dnl VLC_ADD_PLUGINS([dv])
-dnl VLC_ADD_LDFLAGS([dv],[-ldv])
-dnl ],[])
-dnl fi
-
dnl
dnl Flac plugin
dnl
[ --enable-speex Speex decoder support (default enabled)])
if test "${enable_speex}" != "no"
then
- AC_CHECK_HEADERS(speex.h, [
- AC_MSG_CHECKING(for libspeex version > 1.1.0)
- AC_EGREP_CPP(yes,
- [#include <speex.h>
- #ifdef SPEEX_SET_SUBMODE_ENCODING
- yes
- #endif],
- [ AC_MSG_RESULT([yes])
- VLC_ADD_PLUGINS([speex])
- VLC_ADD_LDFLAGS([speex],[-lspeex]) ],
+ AC_CHECK_HEADERS(speex/speex.h, [
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_toolame}"
+ 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.]) ] )
+ version.]) ],[])
+ LDFLAGS="${LDFLAGS_save}"
],[])
fi
])
fi
+dnl
+dnl dirac decoder plugin
+dnl
+AC_ARG_ENABLE(dirac,
+[ --enable-dirac experimental dirac codec (default disabled)])
+if test "${enable_dirac}" = "yes"; then
+ AC_CHECK_HEADERS(libdirac_decoder/dirac_parser.h, [
+ AC_CHECK_LIB(dirac_decoder, dirac_decoder_init, [
+ VLC_ADD_PLUGINS([dirac])
+ VLC_ADD_LDFLAGS([dirac],[-ldirac_decoder -ldirac_encoder -ldirac_motionest -ldirac_common]) ],[
+ AC_MSG_ERROR([libdirac doesn't appear to be installed on you system.])],
+ [-ldirac_common])
+ ])
+fi
+
+dnl
+dnl PNG decoder module
+dnl
+AC_ARG_ENABLE(png,
+ [ --enable-png PNG support (default enabled)])
+if test "${enable_png}" != "no"; then
+AC_CHECK_HEADERS(png.h, [
+ LDFLAGS="${LDFLAGS_save} -lz"
+ AC_CHECK_LIB(png, png_set_rows, [
+ VLC_ADD_LDFLAGS([png],[-lpng -lz])
+ VLC_ADD_PLUGINS([png])
+ AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
+ [],[-lz])
+ LDFLAGS="${LDFLAGS_save}"
+ ])
+fi
+
dnl
dnl H264 encoder plugin (using libx264)
dnl
fi
-dnl
-dnl Video Filters
-dnl
-
-dnl
-dnl png
-dnl
-AC_CHECK_HEADERS(png.h, [
- LDFLAGS="${LDFLAGS_save} -lz"
- AC_CHECK_LIB(png, png_set_rows, [
- VLC_ADD_LDFLAGS([logo],[-lpng -lz])
- VLC_ADD_PLUGINS([logo])
- VLC_ADD_LDFLAGS([svcdsub],[-lpng -lz])
- VLC_ADD_LDFLAGS([cvdsub],[-lpng -lz -lm])
- AC_DEFINE(HAVE_LIBPNG, [], [Define if you have the PNG library: libpng])],
- [],[-lz])
- ])
- LDFLAGS="${LDFLAGS_save}"
-
dnl
dnl Video plugins
dnl
fi
fi
+dnl
+dnl libxml2 module
+dnl
+AC_ARG_ENABLE(libxml2,
+ [ --enable-libxml2 libxml2 support (default enabled)])
+if test "${enable_libxml2}" != "no"
+then
+ XML2_PATH="${PATH}"
+ AC_ARG_WITH(xml2-config-path,
+ [ --with-xml2-config-path=PATH xml2-config path (default search in \$PATH)],
+ [ if test "${with_xml2_config_path}" != "no"; then
+ XML2_PATH="${with_xml2_config_path}:${PATH}"
+ fi ])
+ 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`])
+ dnl depends on the xmlTextReader extension
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_xml}"
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_xml}"
+ AC_CHECK_LIB(xml2,xmlTextReaderConstName,[
+ AC_EGREP_HEADER(xmlTextReaderConstName,libxml/xmlreader.h,[
+ VLC_ADD_PLUGINS([xml]) ],[
+ AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
+ if test "${enable_xml2}" = "yes"; then
+ AC_MSG_ERROR([libxml2 missing the xmlTextReader extension])
+ fi])
+ ],[
+ AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version])
+ if test "${enable_xml2}" = "yes"; then
+ AC_MSG_ERROR([libxml2 missing the xmlTextReader extension])
+ fi])
+ LDFLAGS="${LDFLAGS_save}"
+ CPPFLAGS="${CPPFLAGS_save}"
+ else
+ if test "${enable_xml2}" = "yes"; then
+ AC_MSG_ERROR([Could not find libxml2])
+ fi
+ fi
+fi
+
dnl
dnl SVG module
dnl
dnl freetype
if test "${FREETYPE_CONFIG}" != "no"; then
VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs` -lpng])
+ VLC_ADD_LDFLAGS([skins2],[`${FREETYPE_CONFIG} --libs`])
else
skins2_missing_lib="yes"
if test "${enable_skins2}" = "yes"; then
fi
fi
- dnl libxml2
- XML2_PATH="${PATH}"
- AC_ARG_WITH(xml2-config-path,
- [ --with-xml2-config-path=PATH xml2-config path (default search in \$PATH)],
- [ if test "${with_xml2_config_path}" != "no"; then
- XML2_PATH="${with_xml2_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(XML2_CONFIG, xml2-config, no, ${XML2_PATH})
- if test "${XML2_CONFIG}" != "no"; then
- VLC_ADD_CPPFLAGS([skins2],[`${XML2_CONFIG} --cflags`])
- VLC_ADD_LDFLAGS([skins2],[`${XML2_CONFIG} --libs`])
- dnl skins2 depends on the xmlTextReader extension
- LDFLAGS="${LDFLAGS_save} ${LDFLAGS_skins2}"
- AC_CHECK_LIB(xml2,xmlTextReaderConstName,[],[
- skins2_missing_lib="yes"
- AC_MSG_WARN([libxml2 missing the xmlTextReader extension, you should update your version; maybe you are missing libpng.])
- if test "${enable_skins2}" = "yes"; then
- AC_MSG_ERROR([libxml2 missing the xmlTextReader extension (required for skins2)])
- fi])
- LDFLAGS="${LDFLAGS_save}"
- else
- skins2_missing_lib="yes"
- if test "${enable_skins2}" = "yes"; then
- AC_MSG_ERROR([Could not find libxml2 (required for skins2)])
- fi
- fi
-
if test "${skins2_missing_lib}" = "no" && (test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"); then
VLC_ADD_PLUGINS([skins2])
ALIASES="${ALIASES} svlc"
AC_MSG_ERROR([Your development package for wxWindows is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwindows.])
fi
AC_LANG_PUSH(C++)
+ # Turn this error:
+ # playlist.cpp:1351: error: ISO C++ forbids cast to non-reference type
+ # into a warning. However better would be to fix playlist.cpp
+ AC_CACHE_CHECK([if \$CXX accepts -fpermissive],
+ [ac_cv_cxx_fpermissive],
+ [CXXFLAGS="${CXXFLAGS_save} -fpermissive"
+ AC_TRY_COMPILE([],,ac_cv_cxx_fpermissive=yes,
+ ac_cv_cxx_fpermissive=no)])
+ if test "${ac_cv_cxx_fpermissive}" = "yes"; then
+ VLC_ADD_CXXFLAGS([wxwindows],-fpermissive)
+ fi
VLC_ADD_CXXFLAGS([wxwindows],[`${WX_CONFIG} --cxxflags`])
VLC_ADD_LDFLAGS([wxwindows],[`${WX_CONFIG} --libs`])
# now look for the wxprec.h header
fi
else
AC_CHECK_HEADERS(goom/goom.h, [
+ LDFLAGS="${LDFLAGS_save} ${LDFLAGS_goom}"
AC_CHECK_LIB(goom2, goom_init, [
VLC_ADD_PLUGINS([goom])
VLC_ADD_LDFLAGS([goom],[-lgoom2])
],[
AC_MSG_ERROR([Could not find goom on your system: you may get it from http://www.ios-software.com/.])
])
+ LDFLAGS="${LDFLAGS_save}"
])
fi
fi
modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/ffmpeg/Makefile
- modules/codec/ogt/Makefile
modules/codec/spudec/Makefile
modules/control/Makefile
modules/control/corba/Makefile
modules/misc/network/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
+ modules/misc/xml/Makefile
modules/mux/Makefile
modules/mux/mpeg/Makefile
modules/packetizer/Makefile
projects / vlc / blobdiff