Mercurial > hg > xmms-sid

comparison acinclude.m4 @ 32:13db37492b6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More fixes in the configuration system
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 08 Jun 2003 03:16:04 +0000
parents ca6dab6c4ead
children 3fcc147b253a
comparison
equal deleted inserted replaced
31:ca6dab6c4ead 32:13db37492b6d
425 425
426 MY_TRY_LINK_RESTORE 426 MY_TRY_LINK_RESTORE
427 427
428 if test "$builders_work" = yes; then 428 if test "$builders_work" = yes; then
429 builders_available=yes 429 builders_available=yes
430 AC_DEFINE(XSID_HAVE_RESID_BUILDER) 430 AC_DEFINE(HAVE_RESID_BUILDER)
431 RESID_LDADD="-lresid-builder" 431 RESID_LDADD="-lresid-builder"
432 fi 432 fi
433 AC_MSG_RESULT($builders_work) 433 AC_MSG_RESULT($builders_work)
434 AC_SUBST(RESID_LDADD) 434 AC_SUBST(RESID_LDADD)
435 AC_LANG_POP(C++) 435 AC_LANG_POP(C++)
441 dnl sets $(HARDSID_LDADD), substitutes @HARDSID_LDADD@ 441 dnl sets $(HARDSID_LDADD), substitutes @HARDSID_LDADD@
442 dnl ------------------------------------------------------------------------- 442 dnl -------------------------------------------------------------------------
443 AC_DEFUN(BUILDERS_FIND_HARDSID, 443 AC_DEFUN(BUILDERS_FIND_HARDSID,
444 [ 444 [
445 AC_MSG_CHECKING([for HardSID builder module]) 445 AC_MSG_CHECKING([for HardSID builder module])
446 AC_LANG_PUSH(C++)
446 MY_TRY_LINK_SAVE 447 MY_TRY_LINK_SAVE
447 448
448 CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX" 449 CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
449 CXXFLAGS="$CXXFLAGS $BUILDERS_INCLUDES" 450 CXXFLAGS="$CXXFLAGS $BUILDERS_INCLUDES"
450 LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS" 451 LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS"
451 LIBS="$LIBS -lhardsid-builder" 452 LIBS="$LIBS -lhardsid-builder"
452 453
453 AC_TRY_LINK( 454 AC_LINK_IFELSE([AC_LANG_PROGRAM(
454 [#include <sidplay/builders/hardsid.h>], 455 [[#include <sidplay/builders/hardsid.h>]],
455 [HardSID *sid;], 456 [[HardSID *sid;]])],
456 [builders_work=yes], 457 [builders_work=yes],
457 [builders_work=no] 458 [builders_work=no]
458 ) 459 )
460
459 MY_TRY_LINK_RESTORE 461 MY_TRY_LINK_RESTORE
460 462
461 if test "$builders_work" = yes; then 463 if test "$builders_work" = yes; then
462 builders_available=yes 464 builders_available=yes
463 AC_DEFINE(XSID_HAVE_HARDSID_BUILDER) 465 AC_DEFINE(HAVE_HARDSID_BUILDER)
464 HARDSID_LDADD="-lhardsid-builder" 466 HARDSID_LDADD="-lhardsid-builder"
465 fi 467 fi
466 AC_MSG_RESULT($builders_work) 468 AC_MSG_RESULT($builders_work)
467 AC_SUBST(HARDSID_LDADD) 469 AC_SUBST(HARDSID_LDADD)
468 ]) 470 AC_LANG_POP(C++)
471 ])