Update of /cvsroot/audacity/audacity-src/m4
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7015/m4
Modified Files:
audacity_checklib_libsoundtouch.m4
Log Message:
Add support for Soundtouch 1.4.0 which installs a misnamed pkg-config file.
based on a patch by Brian Cameron
Index: audacity_checklib_libsoundtouch.m4
===================================================================
RCS file: /cvsroot/audacity/audacity-src/m4/audacity_checklib_libsoundtouch.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- audacity_checklib_libsoundtouch.m4 20 Jan 2009 21:23:58 -0000 1.2
+++ audacity_checklib_libsoundtouch.m4 12 Sep 2009 18:35:56 -0000 1.3
@@ -16,11 +16,21 @@
fi
dnl see if soundtouch is installed on the system
+ dnl Fustratingly, the name of the pkg-config file keeps being changed
+ dnl by upstream, despite the fact that they don't need to and shouldn't.
+ dnl as a result (given that 1.3.x and 1.4.0 seem to have idenditcal APIs)
+ dnl we have to check for two possible pkg-config files for the same package.
- PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.0,
+ dnl check for 1.4.x first
+ PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.4 >= 1.3.0,
soundtouch_available_system="yes",
soundtouch_available_system="no")
-
+ dnl if not there, check for 1.3.x
+ if test "x$soundtouch_available_system" = "xno" ; then
+ PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.0,
+ soundtouch_available_system="yes",
+ soundtouch_available_system="no")
+ fi
if test "x$soundtouch_available_system" = "xyes" ; then
LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes"
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
