diff options
| author | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-07-11 20:24:20 +0000 |
|---|---|---|
| committer | mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-07-11 20:24:20 +0000 |
| commit | 0723498eef370f68ef22dfaaeda5dcd1b9d6c788 (patch) | |
| tree | 34f847b0c9cf6a3ea4e0fb097f44543b13c7c3fc /configure | |
| parent | 6ab50ab057f758e13b6cea952cbea8ec07222a4f (diff) | |
| download | mpv-0723498eef370f68ef22dfaaeda5dcd1b9d6c788.tar.bz2 mpv-0723498eef370f68ef22dfaaeda5dcd1b9d6c788.tar.xz | |
Necessary changes for the upcoming libebml/libmatroska 0.5.0. Implemented support for RealAudio and RealVideo inside Matroska.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10411 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 34 |
1 files changed, 19 insertions, 15 deletions
@@ -4169,35 +4169,40 @@ fi echores "$_theora" -echocheck "Matroska support" +echocheck "Matroska support (0.5.0 or later)" if test "$_matroska" != no ; then _matroska=no + _TMPC=$TMPC + TMPC=${TMPC}pp cat > $TMPC << EOF -#include <EbmlConfig.h> +#include <ebml/EbmlVersion.h> +#include <matroska/KaxVersion.h> + +#if LIBEBML_VERSION < 000500 +#error libebml is too old +#endif + +#if LIBMATROSKA_VERSION < 000500 +#error libmatroska is too old +#endif + int main(void) { return 0; } EOF - cc_check -lmatroska -lebml && _matroska=yes + cc_check -lmatroska -lebml -lstdc++ && _matroska=yes if test "$_matroska" = no ; then _saved_inc_extra=$_inc_extra - _inc_extra="$_inc_extra -I/usr/include/ebml -I/usr/include/matroska" - cc_check -lmatroska -lebml && _matroska=yes + _inc_extra="$_inc_extra -I/usr/local/include" + cc_check -lmatroska -lebml -lstdc++ && _matroska=yes if test "$_matroska" = no ; then - _inc_extra="$_saved_inc_extra -I/usr/local/include/ebml -I/usr/local/include/matroska" - cc_check -lmatroska -lebml && _matroska=yes - if test "$_matroska" = no ; then - _inc_extra=$_saved_inc_extra - fi + _inc_extra=$_saved_inc_extra fi fi + TMPC=$_TMPC fi if test "$_matroska" = yes ; then _def_matroska='#define HAVE_MATROSKA 1' _inputmodules="matroska $_inputmodules" _ld_matroska="-lmatroska -lebml -lstdc++" - case $cc_version in - 2.*) _def_matroska_gcc2="#define LIBEBML_GCC2" ;; - *) _def_matroska_gcc2="/*#define LIBEBML_GCC2*/" ;; - esac else _def_matroska='#undef HAVE_MATROSKA' _noinputmodules="matroska $_noinputmodules" @@ -5870,7 +5875,6 @@ $_def_theora /* enable Matroska support */ $_def_matroska -$_def_matroska_gcc2 /* enable FAAD (AAC) support */ $_def_faad |