diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-23 14:45:25 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2004-12-23 14:45:25 +0000 |
| commit | b1eed7b449fe0cab6a04da486f8edda4803a9005 (patch) | |
| tree | a3519b3995d9c9582c8675c06b1b888510df70a0 | |
| parent | 1a193d2c7dcc3ff4aab762b1a8e7c27250e02afe (diff) | |
| download | gst-plugins-bad-b1eed7b449fe0cab6a04da486f8edda4803a9005.tar.gz gst-plugins-bad-b1eed7b449fe0cab6a04da486f8edda4803a9005.tar.bz2 gst-plugins-bad-b1eed7b449fe0cab6a04da486f8edda4803a9005.zip | |
Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1.
Original commit message from CVS:
* configure.ac:
* ext/speex/gstspeexdec.h:
* ext/speex/gstspeexenc.h:
Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1.
Fix detection code in configure.ac
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2004-12-23 Thomas Vander Stichele <thomas at apestaart dot org> + + * configure.ac: + * ext/speex/gstspeexdec.h: + * ext/speex/gstspeexenc.h: + Fixes #158382. Make speex plugin compatible with both 1.0 and 1.1. + Fix detection code in configure.ac + 2004-12-23 Ronald S. Bultje <rbultje@ronald.bitfreak.net> * gst/matroska/matroska-demux.c: diff --git a/configure.ac b/configure.ac index 97064bbe..00f99652 100644 --- a/configure.ac +++ b/configure.ac @@ -1575,10 +1575,10 @@ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ AC_SUBST(SPEEX_CFLAGS) AC_SUBST(SPEEX_LIBS) ], [ - GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [ - AC_CHECK_HEADER(speex_jitter.h, [ + GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex/speex.h, [ + AC_CHECK_HEADER(speex/speex_jitter.h, [ dnl speex 1.1.x : - GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex.h, [ + GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex/speex.h, [ dnl speex 1.1.5 or + : HAVE_SPEEX="yes" SPEEX_LIBS="-lspeex" @@ -1595,9 +1595,14 @@ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ SPEEX_LIBS="-lspeex" AC_SUBST(SPEEX_CFLAGS) AC_SUBST(SPEEX_LIBS) + + AC_DEFINE_UNQUOTED(SPEEX_1_0, 1, + [defined if speex 1.0.x API detected]) ],[ HAVE_SPEEX="no" AC_MSG_NOTICE(You need at least 1.0.4 to compile the speex plugin) + ], [ +#include <speex/speex.h> ]) ]) ]) |