summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2009-03-19 14:49:13 -0700
committerDavid Schleef <ds@schleef.org>2009-04-21 18:55:05 -0700
commitdd4bd78f33da0099b2623b88c8e7e31bef340d0e (patch)
tree5f98bc158fa3caddec35d3774844a45ef0f2302d
parentef5e486fcde5a59e360cf8af42a8f14227f95f5a (diff)
downloadgst-plugins-bad-dd4bd78f33da0099b2623b88c8e7e31bef340d0e.tar.gz
gst-plugins-bad-dd4bd78f33da0099b2623b88c8e7e31bef340d0e.tar.bz2
gst-plugins-bad-dd4bd78f33da0099b2623b88c8e7e31bef340d0e.zip
soundtouch: Add pkgconfig check for soundtouch-1.4
Fixes #573846.
-rw-r--r--configure.ac20
1 files changed, 11 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 58cacad4..d6f6071f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1259,16 +1259,18 @@ AG_GST_CHECK_FEATURE(SNDFILE, [sndfile plug-in], sfsrc sfsink, [
dnl *** soundtouch ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SOUNDTOUCH, true)
AG_GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [
- PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0,
- HAVE_SOUNDTOUCH=yes,
- [PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch,
- HAVE_SOUNDTOUCH=yes,
- HAVE_SOUNDTOUCH=no)])
dnl We only need -lBPM on soundtouch < 1.4
- PKG_CHECK_EXISTS(libSoundTouch >= 1.4,
- AC_DEFINE([HAVE_SOUNDTOUCH_1_4], [1],
- [Defined if the available libSoundTouch is >= 1.4]),
- SOUNDTOUCH_LIBS="$SOUNDTOUCH_LIBS -lBPM")
+ dnl We check for libSoundTouch since Debian used it before upstream
+ dnl added a pkgconfig file.
+ PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.4,
+ HAVE_SOUNDTOUCH=yes,
+ [PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0,
+ HAVE_SOUNDTOUCH=yes
+ SOUNDTOUCH_LIBS=$"SOUNDTOUCH_LIBS -lBPM",
+ [PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch,
+ HAVE_SOUNDTOUCH=yes
+ SOUNDTOUCH_LIBS=$"SOUNDTOUCH_LIBS -lBPM",
+ HAVE_SOUNDTOUCH=no)])])
AC_SUBST(SOUNDTOUCH_CFLAGS)
AC_SUBST(SOUNDTOUCH_LIBS)
if test "x$HAVE_CXX" != "xyes"; then