Mercurial > hg > xmms-sid

diff acinclude.m4 @ 991:34259889b2b1 dev-0_9_1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for libSIDPlay-FP v1.1.x.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 11 Oct 2013 14:37:20 +0300
parents a3ad20eb0f26
children
line wrap: on
line diff
--- a/acinclude.m4	Fri Oct 11 13:47:41 2013 +0300
+++ b/acinclude.m4	Fri Oct 11 14:37:20 2013 +0300
@@ -194,13 +194,12 @@
 
 
 dnl -------------------------------------------------------------------------
-dnl Try to find SIDPLAY2 library and header files.
-dnl $xs_have_sidplay2 will be "yes" or "no"
-dnl @SIDPLAY_LIBS@ will be substituted with linker parameters
-dnl @SIDPLAY_INCLUDES@ will be substituted with compiler parameters
+dnl Try to find SIDPLAY-FP library and header files.
+dnl $xs_have_sidplayfp will be "yes" or "no"
+dnl @SIDPLAYFP_LIBS@ will be substituted with linker parameters
+dnl @SIDPLAYFP_INCLUDES@ will be substituted with compiler parameters
 dnl -------------------------------------------------------------------------
 
-
 AC_DEFUN([XS_PATH_LIBSIDPLAYFP],
 [
     AC_MSG_CHECKING([for working SIDPlayFP library and headers])
@@ -208,7 +207,8 @@
     AC_LANG_PUSH([C++])
     
     PKG_CHECK_EXISTS([libsidplayfp >= 0.3.5], [xs_pkg_sidplayfp="yes"], [])
-    PKG_CHECK_EXISTS([libsidplayfp >= 1.0.0], [xs_pkg_sidplayfp_v1="yes"], [])
+    PKG_CHECK_EXISTS([libsidplayfp >= 1.0.0], [xs_pkg_sidplayfp_v10="yes"], [])
+    PKG_CHECK_EXISTS([libsidplayfp >= 1.1.0], [xs_pkg_sidplayfp_v11="yes"], [])
 
     if test "x$xs_pkg_sidplayfp" = "xyes"; then
         AC_CACHE_VAL([xs_cv_have_sidplayfp],
@@ -216,7 +216,7 @@
             xs_sidplayfp_cflags=`$PKG_CONFIG --libs libsidplayfp`
             xs_sidplayfp_ldflags=`$PKG_CONFIG --libs libsidplayfp`
 
-            if test "x$xs_pkg_sidplayfp_v1" = "xyes"; then
+            if test "x$xs_pkg_sidplayfp_v10" = "xyes"; then
                 XS_TRY_LIBRARY([sidplayfp],
                     [$xs_sidplayfp_cxxflags -DHAVE_UNIX], [$xs_sidplayfp_ldflags],
                     [sidplayfp], [sidplayfp/sidplayfp.h], [sidplayfp *myEngine;])
@@ -230,7 +230,8 @@
               xs_cv_have_sidplayfp="xs_have_sidplayfp=yes  \
                 xs_sidplayfp_cxxflags=\"$xs_sidplayfp_cxxflags\"  \
                 xs_sidplayfp_ldflags=\"$xs_sidplayfp_ldflags\" \
-                xs_pkg_sidplayfp_v1=\"$xs_pkg_sidplayfp_v1\" "
+                xs_pkg_sidplayfp_v10=\"$xs_pkg_sidplayfp_v10\" \
+                xs_pkg_sidplayfp_v11=\"$xs_pkg_sidplayfp_v11\" "
             fi
         ])
     fi
@@ -256,7 +257,12 @@
 ])
 
 
-
+dnl -------------------------------------------------------------------------
+dnl Try to find SIDPLAY2 library and header files.
+dnl $xs_have_sidplay2 will be "yes" or "no"
+dnl @SIDPLAY2_LIBS@ will be substituted with linker parameters
+dnl @SIDPLAY2_INCLUDES@ will be substituted with compiler parameters
+dnl -------------------------------------------------------------------------
 
 AC_DEFUN([XS_PATH_LIBSIDPLAY2],
 [