From 08889d7a8ffaac8e6195783d70e496ede7dea11d Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 22 Apr 2003 14:55:12 +0000 Subject: Added corresponding divx/xvid decoders and fixed some first-hand encoder bugs Original commit message from CVS: Added corresponding divx/xvid decoders and fixed some first-hand encoder bugs --- configure.ac | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c88fb58f..5ce2ea77 100644 --- a/configure.ac +++ b/configure.ac @@ -511,14 +511,24 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true) GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [ HAVE_DIVX=yes AC_CHECK_HEADER(encore2.h, , - [ AC_MSG_WARN([Divx4linux headers not found]) && + [ AC_MSG_WARN([Divx4linux encore headers not found]) && + HAVE_DIVX=no ] ) + AC_CHECK_HEADER(decore.h, , + [ AC_MSG_WARN([Divx4linux decoder headers not found]) && HAVE_DIVX=no ] ) LIBS="-lm" AC_CHECK_LIB(divxencore, encore, , - [ AC_MSG_WARN([Divx4linux libs not found]) && + [ AC_MSG_WARN([Divx4linux encore libs not found]) && + HAVE_DIVX=no ] ) + AC_CHECK_LIB(divxdecore, decore, , + [ AC_MSG_WARN([Divx4linux decore libs not found]) && HAVE_DIVX=no ] ) - DIVX_LIBS="-lxvidcore -lm" - AC_SUBST(DIVX_LIBS) + if test x$HAVE_DIVX = xyes; then + DIVXENC_LIBS="-ldivxencore -lm" + DIVXDEC_LIBS="-ldivxdecore -lm" + AC_SUBST(DIVXENC_LIBS) + AC_SUBST(DIVXDEC_LIBS) + fi ]) dnl *** dvdread *** @@ -899,10 +909,15 @@ GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [ HAVE_XVID=no ] ) LIBS="-lm" AC_CHECK_LIB(xvidcore, xvid_encore, , - [ AC_MSG_WARN([Xvid libs not found]) && + [ AC_MSG_WARN([Xvid encore libs not found]) && HAVE_XVID=no ] ) - XVID_LIBS="-lxvidcore -lm" - AC_SUBST(XVID_LIBS) + AC_CHECK_LIB(xvidcore, xvid_decore, , + [ AC_MSG_WARN([Xvid decore libs not found]) && + HAVE_XVID=no ] ) + if test x$HAVE_XVID = xyes; then + XVID_LIBS="-lxvidcore -lm" + AC_SUBST(XVID_LIBS) + fi ]) -- cgit v1.2.1