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

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
comparison
equal deleted inserted replaced
990:15995c18e410 991:34259889b2b1
192 [sidplay], [sidplay/sidtune.h], [sidTune* myTest = new sidTune(0);]) 192 [sidplay], [sidplay/sidtune.h], [sidTune* myTest = new sidTune(0);])
193 ]) 193 ])
194 194
195 195
196 dnl ------------------------------------------------------------------------- 196 dnl -------------------------------------------------------------------------
197 dnl Try to find SIDPLAY2 library and header files. 197 dnl Try to find SIDPLAY-FP library and header files.
198 dnl $xs_have_sidplay2 will be "yes" or "no" 198 dnl $xs_have_sidplayfp will be "yes" or "no"
199 dnl @SIDPLAY_LIBS@ will be substituted with linker parameters 199 dnl @SIDPLAYFP_LIBS@ will be substituted with linker parameters
200 dnl @SIDPLAY_INCLUDES@ will be substituted with compiler parameters 200 dnl @SIDPLAYFP_INCLUDES@ will be substituted with compiler parameters
201 dnl ------------------------------------------------------------------------- 201 dnl -------------------------------------------------------------------------
202
203 202
204 AC_DEFUN([XS_PATH_LIBSIDPLAYFP], 203 AC_DEFUN([XS_PATH_LIBSIDPLAYFP],
205 [ 204 [
206 AC_MSG_CHECKING([for working SIDPlayFP library and headers]) 205 AC_MSG_CHECKING([for working SIDPlayFP library and headers])
207 206
208 AC_LANG_PUSH([C++]) 207 AC_LANG_PUSH([C++])
209 208
210 PKG_CHECK_EXISTS([libsidplayfp >= 0.3.5], [xs_pkg_sidplayfp="yes"], []) 209 PKG_CHECK_EXISTS([libsidplayfp >= 0.3.5], [xs_pkg_sidplayfp="yes"], [])
211 PKG_CHECK_EXISTS([libsidplayfp >= 1.0.0], [xs_pkg_sidplayfp_v1="yes"], []) 210 PKG_CHECK_EXISTS([libsidplayfp >= 1.0.0], [xs_pkg_sidplayfp_v10="yes"], [])
211 PKG_CHECK_EXISTS([libsidplayfp >= 1.1.0], [xs_pkg_sidplayfp_v11="yes"], [])
212 212
213 if test "x$xs_pkg_sidplayfp" = "xyes"; then 213 if test "x$xs_pkg_sidplayfp" = "xyes"; then
214 AC_CACHE_VAL([xs_cv_have_sidplayfp], 214 AC_CACHE_VAL([xs_cv_have_sidplayfp],
215 [ 215 [
216 xs_sidplayfp_cflags=`$PKG_CONFIG --libs libsidplayfp` 216 xs_sidplayfp_cflags=`$PKG_CONFIG --libs libsidplayfp`
217 xs_sidplayfp_ldflags=`$PKG_CONFIG --libs libsidplayfp` 217 xs_sidplayfp_ldflags=`$PKG_CONFIG --libs libsidplayfp`
218 218
219 if test "x$xs_pkg_sidplayfp_v1" = "xyes"; then 219 if test "x$xs_pkg_sidplayfp_v10" = "xyes"; then
220 XS_TRY_LIBRARY([sidplayfp], 220 XS_TRY_LIBRARY([sidplayfp],
221 [$xs_sidplayfp_cxxflags -DHAVE_UNIX], [$xs_sidplayfp_ldflags], 221 [$xs_sidplayfp_cxxflags -DHAVE_UNIX], [$xs_sidplayfp_ldflags],
222 [sidplayfp], [sidplayfp/sidplayfp.h], [sidplayfp *myEngine;]) 222 [sidplayfp], [sidplayfp/sidplayfp.h], [sidplayfp *myEngine;])
223 else 223 else
224 XS_TRY_LIBRARY([sidplayfp], 224 XS_TRY_LIBRARY([sidplayfp],
228 228
229 if test "x$xs_sidplayfp_works" = "xyes"; then 229 if test "x$xs_sidplayfp_works" = "xyes"; then
230 xs_cv_have_sidplayfp="xs_have_sidplayfp=yes \ 230 xs_cv_have_sidplayfp="xs_have_sidplayfp=yes \
231 xs_sidplayfp_cxxflags=\"$xs_sidplayfp_cxxflags\" \ 231 xs_sidplayfp_cxxflags=\"$xs_sidplayfp_cxxflags\" \
232 xs_sidplayfp_ldflags=\"$xs_sidplayfp_ldflags\" \ 232 xs_sidplayfp_ldflags=\"$xs_sidplayfp_ldflags\" \
233 xs_pkg_sidplayfp_v1=\"$xs_pkg_sidplayfp_v1\" " 233 xs_pkg_sidplayfp_v10=\"$xs_pkg_sidplayfp_v10\" \
234 xs_pkg_sidplayfp_v11=\"$xs_pkg_sidplayfp_v11\" "
234 fi 235 fi
235 ]) 236 ])
236 fi 237 fi
237 238
238 eval "$xs_cv_have_sidplayfp" 239 eval "$xs_cv_have_sidplayfp"
254 255
255 AC_LANG_POP([C++]) 256 AC_LANG_POP([C++])
256 ]) 257 ])
257 258
258 259
259 260 dnl -------------------------------------------------------------------------
261 dnl Try to find SIDPLAY2 library and header files.
262 dnl $xs_have_sidplay2 will be "yes" or "no"
263 dnl @SIDPLAY2_LIBS@ will be substituted with linker parameters
264 dnl @SIDPLAY2_INCLUDES@ will be substituted with compiler parameters
265 dnl -------------------------------------------------------------------------
260 266
261 AC_DEFUN([XS_PATH_LIBSIDPLAY2], 267 AC_DEFUN([XS_PATH_LIBSIDPLAY2],
262 [ 268 [
263 AC_MSG_CHECKING([for working SIDPlay2 library and headers]) 269 AC_MSG_CHECKING([for working SIDPlay2 library and headers])
264 270