From 53ce1453d12119ab960d97fb612028787601779c Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 23 Apr 2009 17:33:25 +0100 Subject: 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. --- configure.ac | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d6f6071f..5904e953 100644 --- a/configure.ac +++ b/configure.ac @@ -1262,11 +1262,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", @@ -1277,6 +1279,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 *** -- cgit v1.2.1