changeset 854:9313d991957a dev-0_8_92

libSIDPlay2 and libSIDPlayFP don't play together due to symbol conflicts, so disable the other one.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 08 Nov 2012 23:40:20 +0200
parents 1f97cd026465
children 499472046122
files configure.ac
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Nov 08 23:39:48 2012 +0200
+++ b/configure.ac	Thu Nov 08 23:40:20 2012 +0200
@@ -111,6 +111,10 @@
 dnl ***
 dnl *** libSIDPlay1/2 options
 dnl ***
+xs_have_sidplay1=no
+xs_have_sidplay2=no
+xs_have_sidplayfp=no
+
 XS_ARG_WITH([sidplay1], [libSIDPlay1], [XS_PATH_LIBSIDPLAY1])
 if test "x$xs_have_sidplay1" = "xyes"; then
 	AC_DEFINE([HAVE_SIDPLAY1])
@@ -128,8 +132,8 @@
 		AC_DEFINE([HAVE_SIDPLAYFP_V1])
 		xs_have_sidplay2_api="(FP v1.0 (alpha) API)"
 	fi
-fi
-
+dnl fi
+else
 xs_have_sidplay2_api=""
 XS_ARG_WITH([sidplay2], [libSIDPlay2], [XS_PATH_LIBSIDPLAY2])
 if test "x$xs_have_sidplay2" = "xyes"; then
@@ -151,7 +155,7 @@
 
 	AC_LANG_POP([C++])
 fi
-
+fi
 
 dnl ***
 dnl *** Check if we have some emulator library available?