From: David Kastrup <dak@gnu.org>
Date: Sat, 12 Nov 2011 14:28:13 +0000 (+0100)
Subject: Fix autoconf fallout from yaffut fix
X-Git-Tag: release/2.15.19-1~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a5498a5f1ed86246e7defc975e8124091b7bbae5;p=lilypond.git

Fix autoconf fallout from yaffut fix
---

diff --git a/configure.in b/configure.in
index 3770c89f9d..f7638ad389 100644
--- a/configure.in
+++ b/configure.in
@@ -125,14 +125,10 @@ CXXFLAGS="$save_CXXFLAGS"
 
 ## Check for usable cxxabi
 AC_MSG_CHECKING(for usable C++ demangler)
-AC_LINK_IFELSE([#include <cxxabi.h>
-int main(){
-    size_t sz;
-    int status;
-    char *ptr = abi::__cxa_demangle ("", 0, &sz, &status);
-    return 0;
- }], [AC_DEFINE(HAVE_CXA_DEMANGLE)
-      AC_MSG_RESULT(yes)],
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+	    [abi::__cxa_demangle ("", 0, 0, 0)]);],
+    [AC_DEFINE(HAVE_CXA_DEMANGLE)
+AC_MSG_RESULT(yes)],
     [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])
 
 ## check rational bugfix.