Commit c3525fe1 authored by Stéphane Loeuillet's avatar Stéphane Loeuillet
Browse files

configure.ac: change speex detection as 1.1.6 now uses .pc/pkg-config and they...

configure.ac: change speex detection as 1.1.6 now uses .pc/pkg-config and they changed their headers location.

Original commit message from CVS:
* configure.ac : change speex detection as 1.1.6 now uses
.pc/pkg-config and they changed their headers location.
parent f167cf80
2004-09-12 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* configure.ac : change speex detection as 1.1.6 now uses
.pc/pkg-config and they changed their headers location.
2004-09-09 Arwed v. Merkatz <v.merkatz@gmx.net>
* gst/matroska/matroska-mux.h:
* gst/matroska/matroska-mux.c: (gst_matroska_mux_reset),
(gst_matroska_mux_start), (gst_matroska_mux_finish),
......
......@@ -1505,28 +1505,36 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
AC_SUBST(LIBPNG_LIBS)
])
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
dnl *** speex 1.0.x or >= 1.1.5 ***
dnl 1.1.4 and earlier were not API/ABI compatible with 1.0
dnl 1.1.6 is the first to use a .pc/pkg-config file ***
dnl speex_jitter.h is 1.1.x 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, [
dnl speex 1.1.x :
GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex.h, [
dnl speex 1.1.5 or + :
PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, [
HAVE_SPEEX="yes"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
], [
GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [
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)
AC_SUBST(SPEEX_LIBS)
],[
HAVE_SPEEX="no"
])
], [
dnl speex 1.0.x :
HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
])
])
])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment