# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1257517219 -7200
# Node ID 92c284766c49fdb17721fd8a64eea3125ee60578
# Parent  171f42746b887fbd04d408155e5f00b0e58074f0
Synchronize changes from Audacious port.

diff -r 171f42746b88 -r 92c284766c49 acinclude.m4
--- a/acinclude.m4	Thu Oct 22 14:54:33 2009 +0300
+++ b/acinclude.m4	Fri Nov 06 16:20:19 2009 +0200
@@ -311,9 +311,6 @@
     AC_LANG_ASSERT([C++])
     AC_REQUIRE([XS_PATH_LIBSIDPLAY2])
 
-    dnl Be pessimistic.
-    builders_available="no"
-
     dnl Sidbuilder headers are included with "builders" prefix.
     builders_includedir="$xs_sidplay2_includes"
     builders_libdir="$xs_sidplay2_builders"
diff -r 171f42746b88 -r 92c284766c49 configure.ac
--- a/configure.ac	Thu Oct 22 14:54:33 2009 +0300
+++ b/configure.ac	Fri Nov 06 16:20:19 2009 +0200
@@ -105,6 +105,7 @@
 	AC_LANG_PUSH([C++])
 	
 	XS_BUILDERS_CHECK
+        xs_builders_available="no"
 	XS_BUILDERS_FIND([reSID], [resid-builder], [resid.h], [ReSIDBuilder])
 	XS_BUILDERS_FIND([HardSID], [hardsid-builder], [hardsid.h], [HardSID])
 	if test "x$xs_builders_available" = "xno"; then
@@ -120,7 +121,7 @@
 	AC_EGREP_HEADER([::Iid], [sidplay/sidplay2.h],
 		[xs_have_sidplay2_api="yes"],
 		[
-		AC_EGREP_HEADER([SIDIID],
+		AC_EGREP_HEADER([SIDIID], [sidplay/sidplay2.h],
 			[xs_have_sidplay2_api="yes"],
 			[xs_have_sidplay2_api="(old style API)"])
 		]
@@ -132,7 +133,7 @@
 		[ISidUnknown *i;])
 	], [
 		xs_have_sidplay2_api="(new COMI style API)"
-		AC_DEFINE([HAVE_SIDPLAY2_COMI])
+		AC_DEFINE([HAVE_SIDPLAY2_COMI], [1], [Define if using new libSIDPlay2 with COM-style API.])
 	],[
 		xs_have_sidplay2_api="(broken version!)"
 	])