From a02ef49af9f3a58930d59fca4e46edbd2c8e8899 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 15 Mar 2004 22:34:48 +0000 Subject: [PATCH] work with speex 1.0, not 1.1 Original commit message from CVS: work with speex 1.0, not 1.1 --- ChangeLog | 4 ++++ configure.ac | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb2b6c8..8aad8c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-03-15 Thomas Vander Stichele + * configure.ac: fix speex detection to work with 1.0 but not 1.1 + +2004-03-15 Thomas Vander Stichele + * configure.ac: * gst-plugins.spec.in: * pkgconfig/Makefile.am: diff --git a/configure.ac b/configure.ac index 387103c..66f77bc 100644 --- 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) + ]) ]) ]) -- 2.7.4