comparison configure @ 11330:a974c00c779d

Removed temporary .cpp file used during the Matroska test. Updated the libebml and libmatroska requirements to at least v0.6.0 for both. There have been changes in the lacing code, and users WILL come and complain why mplayer, linked against older versions, will have issues playing newer files.

11329:9165908f87d3

  _nocodecmodules="libtheora $_nocodecmodules"
fi
echores "$_theora"


echocheck "Matroska support (0.5.0 or later)"
if test "$_matroska" != no ; then
  _matroska=no
  _TMPC=$TMPC
  TMPC=${TMPC}pp
  cat > $TMPC << EOF
#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 -lstdc++ && _matroska=yes
    if test "$_matroska" = no ; then
      _inc_extra=$_saved_inc_extra
    fi
  fi
  TMPC=$_TMPC
fi
if test "$_matroska" = yes ; then
  _def_matroska='#define HAVE_MATROSKA 1'
  _inputmodules="matroska $_inputmodules"

11330:a974c00c779d

  _nocodecmodules="libtheora $_nocodecmodules"
fi
echores "$_theora"


echocheck "Matroska support (0.6.0 or later)"
if test "$_matroska" != no ; then
  _matroska=no
  _TMPC=$TMPC
  TMPC=${TMPC}pp
  cat > $TMPC << EOF
#include <ebml/EbmlVersion.h>
#include <matroska/KaxVersion.h>

#if LIBEBML_VERSION < 000600
#error libebml is too old
#endif

#if LIBMATROSKA_VERSION < 000600
#error libmatroska is too old
#endif

int main(void) { return 0; }
EOF

    cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
    if test "$_matroska" = no ; then
      _inc_extra=$_saved_inc_extra
    fi
  fi
  rm ${TMPC} > /dev/null 2> /dev/null
  TMPC=$_TMPC
fi
if test "$_matroska" = yes ; then
  _def_matroska='#define HAVE_MATROSKA 1'
  _inputmodules="matroska $_inputmodules"