marlin r1338 - trunk

[iain svn gnome org]

Author: iain
Date: Wed Nov  5 00:48:54 2008
New Revision: 1338
URL: http://svn.gnome.org/viewvc/marlin?rev=1338&view=rev

Log:
Squashed commit of the following:

commit 2bf3f95bd2840cb86f352ef79caab16e7c570e52
Author: iain <iain gnome org>
Date:   Wed Nov 5 00:45:14 2008 +0000

    Check for both versions of SoundTouch


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Nov  5 00:48:54 2008
@@ -99,7 +99,15 @@
 AC_SUBST(UNIQUE_CFLAGS)
 AC_SUBST(UNIQUE_LIBS)
 
-PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.1)
+PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.1, have_st=yes, have_st=no)
+
+if test "x$have_st" = "xno"; then 
+  PKG_CHECK_MODULES(SOUNDTOUCH, libSoundTouch >= 1.2.1, have_st=yes, have_st=no)
+  if test "x$have_st" = "xno"; then
+    AC_MSG_ERROR([SoundTouch is require for Marlin. http://www.surina.net/soundtouch])
+  fi
+fi
+
 AC_SUBST(SOUNDTOUCH_CFLAGS)
 AC_SUBST(SOUNDTOUCH_LIBS)