diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-04-23 17:33:25 +0100 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-05-03 12:03:17 -0400 |
| commit | 2404b56077491850cdfb5f2741f7a7ead995931b (patch) | |
| tree | a37d5200212c1aea7e812f6532d8a5cb5b70c191 | |
| parent | c35eccd7cf9a6f79e2c4f46e313062999cf3a247 (diff) | |
| download | gst-plugins-bad-2404b56077491850cdfb5f2741f7a7ead995931b.tar.gz gst-plugins-bad-2404b56077491850cdfb5f2741f7a7ead995931b.tar.bz2 gst-plugins-bad-2404b56077491850cdfb5f2741f7a7ead995931b.zip | |
soundtouch: Fix compilation on newer libSoundTouch
Newer libsoundtouch requires that we include an extra header that wasn't
previously required, so define HAVE_SOUNDTOUCH_1_4 for newer builds so that it
gets included.
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 675371ee..79e895af 100644 --- a/configure.ac +++ b/configure.ac @@ -1270,11 +1270,13 @@ AG_GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [ dnl We only need -lBPM on soundtouch < 1.4 dnl We check for libSoundTouch since Debian used it before upstream dnl added a pkgconfig file. + HAVE_SOUNDTOUCH_1_4=yes PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.4, - HAVE_SOUNDTOUCH=yes, + [HAVE_SOUNDTOUCH=yes], [PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0, - HAVE_SOUNDTOUCH=yes - SOUNDTOUCH_LIBS=$"SOUNDTOUCH_LIBS -lBPM", + [HAVE_SOUNDTOUCH=yes + HAVE_SOUNDTOUCH_1_4=no + SOUNDTOUCH_LIBS=$"SOUNDTOUCH_LIBS -lBPM"], [PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch, HAVE_SOUNDTOUCH=yes SOUNDTOUCH_LIBS=$"SOUNDTOUCH_LIBS -lBPM", @@ -1285,6 +1287,10 @@ AG_GST_CHECK_FEATURE(SOUNDTOUCH, [soundtouch plug-in], soundtouch, [ USE_SOUNDTOUCH=false AC_MSG_NOTICE([Not building soundtouch plugin: no C++ compiler found]) fi + if test "x$HAVE_SOUNDTOUCH" = "xyes" -a "x$HAVE_SOUNDTOUCH_1_4" = "xyes"; then + AC_DEFINE([HAVE_SOUNDTOUCH_1_4], [1], + [Defined if the available libSoundTouch is >= 1.4]) + fi ]) dnl *** spc *** |