comparison configure.ac @ 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 483db1c33059
children fe3ed2b22a78
comparison
equal deleted inserted replaced
853:1f97cd026465 854:9313d991957a
109 109
110 110
111 dnl *** 111 dnl ***
112 dnl *** libSIDPlay1/2 options 112 dnl *** libSIDPlay1/2 options
113 dnl *** 113 dnl ***
114 xs_have_sidplay1=no
115 xs_have_sidplay2=no
116 xs_have_sidplayfp=no
117
114 XS_ARG_WITH([sidplay1], [libSIDPlay1], [XS_PATH_LIBSIDPLAY1]) 118 XS_ARG_WITH([sidplay1], [libSIDPlay1], [XS_PATH_LIBSIDPLAY1])
115 if test "x$xs_have_sidplay1" = "xyes"; then 119 if test "x$xs_have_sidplay1" = "xyes"; then
116 AC_DEFINE([HAVE_SIDPLAY1]) 120 AC_DEFINE([HAVE_SIDPLAY1])
117 fi 121 fi
118 122
126 AC_DEFINE([HAVE_RESID_FP_BUILDER]) 130 AC_DEFINE([HAVE_RESID_FP_BUILDER])
127 if test "x$xs_pkg_sidplayfp_v1" = "xyes"; then 131 if test "x$xs_pkg_sidplayfp_v1" = "xyes"; then
128 AC_DEFINE([HAVE_SIDPLAYFP_V1]) 132 AC_DEFINE([HAVE_SIDPLAYFP_V1])
129 xs_have_sidplay2_api="(FP v1.0 (alpha) API)" 133 xs_have_sidplay2_api="(FP v1.0 (alpha) API)"
130 fi 134 fi
131 fi 135 dnl fi
132 136 else
133 xs_have_sidplay2_api="" 137 xs_have_sidplay2_api=""
134 XS_ARG_WITH([sidplay2], [libSIDPlay2], [XS_PATH_LIBSIDPLAY2]) 138 XS_ARG_WITH([sidplay2], [libSIDPlay2], [XS_PATH_LIBSIDPLAY2])
135 if test "x$xs_have_sidplay2" = "xyes"; then 139 if test "x$xs_have_sidplay2" = "xyes"; then
136 xs_have_sidplay2_api="(old non-COMI)" 140 xs_have_sidplay2_api="(old non-COMI)"
137 AC_DEFINE([HAVE_SIDPLAY2]) 141 AC_DEFINE([HAVE_SIDPLAY2])
149 AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]); 153 AC_MSG_ERROR([No builder modules were found in the sidbuilders directory!]);
150 fi 154 fi
151 155
152 AC_LANG_POP([C++]) 156 AC_LANG_POP([C++])
153 fi 157 fi
154 158 fi
155 159
156 dnl *** 160 dnl ***
157 dnl *** Check if we have some emulator library available? 161 dnl *** Check if we have some emulator library available?
158 dnl *** 162 dnl ***
159 if test "x$xs_have_sidplay1" != "xyes" -a "x$xs_have_sidplay2" != "xyes" -a "x$xs_have_sidplayfp" != "xyes"; then 163 if test "x$xs_have_sidplay1" != "xyes" -a "x$xs_have_sidplay2" != "xyes" -a "x$xs_have_sidplayfp" != "xyes"; then