From f8a81a2cf82328d483c039530a7b8d6106f16cc6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Loeuillet?= Date: Thu, 20 May 2004 21:57:11 +0000 Subject: [PATCH] - reenable speex plugins for speex 1.1.5 (API/ABI compatible with 1.0.x) Original commit message from CVS: - reenable speex plugins for speex 1.1.5 (API/ABI compatible with 1.0.x) - fix a cast warning that prevent compilation of speexenc --- configure.ac | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index eba293a..b242d44 100644 --- a/configure.ac +++ b/configure.ac @@ -1425,12 +1425,24 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [ AC_SUBST(LIBPNG_LIBS) ]) -dnl *** speex 1.0 only, not 1.1 *** +dnl *** speex 1.0.x or >= 1.1.5 (1.1.4 and earlier were not API/ABI compatible *** dnl speex_jitter.h is 1.1 only translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true) GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [ - AC_CHECK_HEADER(speex_jitter.h, HAVE_SPEEX="no", [ + AC_CHECK_HEADER(speex_jitter.h, [ + dnl speex 1.1.x : + GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex.h, [ + dnl speex 1.1.5 or + : + HAVE_SPEEX="yes" + SPEEX_LIBS="-lspeex" + AC_SUBST(SPEEX_CFLAGS) + AC_SUBST(SPEEX_LIBS) + ],[ + HAVE_SPEEX="no" + ]) + ], [ + dnl speex 1.0.x : HAVE_SPEEX="yes" SPEEX_LIBS="-lspeex" AC_SUBST(SPEEX_CFLAGS) -- 2.7.4