mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Stéphane Loeuillet 2004-09-12 13:35:52 +00:00
parent efc4b3bd1a
commit 8dfcf043e5
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,10 @@
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> 2004-09-09 Arwed v. Merkatz <v.merkatz@gmx.net>
* gst/matroska/matroska-mux.h: * gst/matroska/matroska-mux.h:
* gst/matroska/matroska-mux.c: (gst_matroska_mux_reset), * gst/matroska/matroska-mux.c: (gst_matroska_mux_reset),
(gst_matroska_mux_start), (gst_matroska_mux_finish), (gst_matroska_mux_start), (gst_matroska_mux_finish),

38
configure.ac
View file

@ -1505,28 +1505,36 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
AC_SUBST(LIBPNG_LIBS) 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 1.0.x or >= 1.1.5 ***
dnl speex_jitter.h is 1.1 only 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) translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true)
GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [
GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [ PKG_CHECK_MODULES(SPEEX, speex >= 1.1.6, [
AC_CHECK_HEADER(speex_jitter.h, [ HAVE_SPEEX="yes"
dnl speex 1.1.x : AC_SUBST(SPEEX_CFLAGS)
GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex.h, [ AC_SUBST(SPEEX_LIBS)
dnl speex 1.1.5 or + : ], [
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" HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex" SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS) AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS) 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)
]) ])
]) ])
]) ])