X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=0189be15b2aedb767832d777eccd8c6955dde845;hb=4b4331d24c2c39592f2da381156da92d140c9419;hp=cf0178f457b5c3ac0e0971ebe23617f2aacc0584;hpb=33fd36cc8b74a2a0e80e43a8dc9dbfcb7d1f7df1;p=lilypond.git

diff --git a/configure.in b/configure.in
index cf0178f457..0189be15b2 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)
@@ -123,6 +128,24 @@ AC_CHECK_TYPES([scm_t_subr],
 	       [#include <libguile.h>])
 CXXFLAGS="$save_CXXFLAGS"
 
+## Check for usable cxxabi
+save_LIBS="$LIBS"
+LIBS="$LIBS $CXXABI_LIBS"
+AC_MSG_CHECKING(for usable C++ demangler)
+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"
 CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
@@ -187,7 +210,7 @@ STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
-STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL)
+STEPMAKE_PROGS(DBLATEX, dblatex, OPTIONAL, 0.1.4)
 STEPMAKE_PROGS(PDFLATEX, pdflatex, OPTIONAL)
 STEPMAKE_PROGS(NETPBM, pngtopnm, OPTIONAL)
 STEPMAKE_PROGS(IMAGEMAGICK, convert, OPTIONAL)