Mercurial > hg > xmms-sid
changeset 32:13db37492b6d
More fixes in the configuration system
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 08 Jun 2003 03:16:04 +0000 |
parents | ca6dab6c4ead |
children | 9cf8092ec7d3 |
files | acinclude.m4 configure.in |
diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/acinclude.m4 Sun Jun 08 03:03:01 2003 +0000 +++ b/acinclude.m4 Sun Jun 08 03:16:04 2003 +0000 @@ -427,7 +427,7 @@ if test "$builders_work" = yes; then builders_available=yes - AC_DEFINE(XSID_HAVE_RESID_BUILDER) + AC_DEFINE(HAVE_RESID_BUILDER) RESID_LDADD="-lresid-builder" fi AC_MSG_RESULT($builders_work) @@ -443,6 +443,7 @@ AC_DEFUN(BUILDERS_FIND_HARDSID, [ AC_MSG_CHECKING([for HardSID builder module]) + AC_LANG_PUSH(C++) MY_TRY_LINK_SAVE CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX" @@ -450,19 +451,21 @@ LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS" LIBS="$LIBS -lhardsid-builder" - AC_TRY_LINK( - [#include <sidplay/builders/hardsid.h>], - [HardSID *sid;], + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[#include <sidplay/builders/hardsid.h>]], + [[HardSID *sid;]])], [builders_work=yes], [builders_work=no] ) + MY_TRY_LINK_RESTORE if test "$builders_work" = yes; then builders_available=yes - AC_DEFINE(XSID_HAVE_HARDSID_BUILDER) + AC_DEFINE(HAVE_HARDSID_BUILDER) HARDSID_LDADD="-lhardsid-builder" fi AC_MSG_RESULT($builders_work) AC_SUBST(HARDSID_LDADD) + AC_LANG_POP(C++) ])
--- a/configure.in Sun Jun 08 03:03:01 2003 +0000 +++ b/configure.in Sun Jun 08 03:16:04 2003 +0000 @@ -171,8 +171,10 @@ dnl *** Define some templates dnl *** AC_DEFINE(ENABLE_XMMSEXTRA, 0, Define to 1 if you have XMMS version 1.2.5 or later) -AC_DEFINE(ENABLE_SIDPLAY1, 1, Define to 1 if you want to use libSIDPlay 1) -AC_DEFINE(ENABLE_SIDPLAY2, 1, Define to 1 if you want to use libSIDPlay 2) +AC_DEFINE(ENABLE_SIDPLAY1, 0, Define to 1 if you want to use libSIDPlay 1) +AC_DEFINE(ENABLE_SIDPLAY2, 0, Define to 1 if you want to use libSIDPlay 2) +AC_DEFINE(HAVE_RESID_BUILDER, 0, Define to 1 if you have reSID with libSIDPlay 2) +AC_DEFINE(HAVE_HARDSID_BUILDER, 0, Define to 1 if you have HardSID with libSIDPlay 2) dnl ***