--- 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++)
 ])