X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=b2fc7f4be7cfa6b7e845e56e8e901cef327d4155;hb=27778e71840f517d1ed4ab3529051809ef4cbd74;hp=3770c89f9d1aadf61e99b74114041109e2fc6ea6;hpb=be9de62c7e951ea7e7cfc932466a40370909bf2d;p=lilypond.git

diff --git a/configure.in b/configure.in
index 3770c89f9d..b2fc7f4be7 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
 
-# Bootstrap the init proces.
+# Bootstrap the init process.
 AC_INIT
 
 # Bootstrap StepMake configure
@@ -91,10 +91,15 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
 AC_LANG([C++])
 
 STEPMAKE_PYTHON(REQUIRED, 2.4)
-STEPMAKE_GCC(REQUIRED, 3.4)
+# this checks if we have GNU C by compiling a program with
+# __GNUC__, but that macro now unofficially means "the compiler
+# supports the GNU C extensions" -- the intel C compiler and clang
+# both support __GNUC__!
+STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4)
 
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.4)
+STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4)
+STEPMAKE_GXXCODEGENBUG
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)
@@ -124,16 +129,22 @@ AC_CHECK_TYPES([scm_t_subr],
 CXXFLAGS="$save_CXXFLAGS"
 
 ## Check for usable cxxabi
+save_LIBS="$LIBS"
+LIBS="$LIBS $CXXABI_LIBS"
 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_MSG_RESULT([no, use c++filt -t for manual demangling])])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+	    [abi::__cxa_demangle ("", 0, 0, 0)])],
+    [AC_DEFINE(HAVE_CXA_DEMANGLE)
+	AC_MSG_RESULT(yes)],[
+	LIBS="$LIBS -lsupc++"
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+		    [abi::__cxa_demangle ("", 0, 0, 0)])],
+	    [AC_DEFINE(HAVE_CXA_DEMANGLE)
+		AC_MSG_RESULT([yes, using -lsupc++])
+		CXXABI_LIBS="$CXXABI_LIBS -lsupc++"],
+	    [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])])
+LIBS="$save_LIBS"
+AC_SUBST(CXXABI_LIBS)
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"