work with speex 1.0, not 1.1

Original commit message from CVS:
work with speex 1.0, not 1.1

diff --git a/ChangeLog b/ChangeLog
index fb2b6c89f848add37046bf3937d1fee6482a95a5..8aad8c08920a03160ef8f8d2025cfc70926bbca1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * configure.ac: fix speex detection to work with 1.0 but not 1.1
+
 2004-03-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 387103c20dc5d11b904a969332946df9dac5ffe8..66f77bc97ab9e72484a06c85218173ec6923a3f3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1277,17 +1277,17 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
   AC_SUBST(LIBPNG_LIBS)
 ])
 
-dnl *** speex ***
+dnl *** speex 1.0 only, not 1.1 ***
+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, [
-  PKG_CHECK_MODULES(SPEEX, speex >= 1.0 speex < 1.1, [
-    HAVE_SPEEX="yes"
-    AC_SUBST(SPEEX_CFLAGS)
-    AC_SUBST(SPEEX_LIBS)
-  ], [
-    GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, HAVE_SPEEX="yes" SPEEX_LIBS="-lspeex")
-    AC_SUBST(SPEEX_CFLAGS)
-    AC_SUBST(SPEEX_LIBS)
+  GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [
+    AC_CHECK_HEADER(speex_jitter.h, HAVE_SPEEX="no", [
+      HAVE_SPEEX="yes"
+      SPEEX_LIBS="-lspeex"
+      AC_SUBST(SPEEX_CFLAGS)
+      AC_SUBST(SPEEX_LIBS)
+    ])
   ])
 ])