X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=0189be15b2aedb767832d777eccd8c6955dde845;hb=76465a6d1c77ff1b30e5c61e9e06178b8d5290d4;hp=74a27bbfa8a29bdbc0e2ba83f56cddaa4e48f725;hpb=2b76b924d478e68baaacfca52c6819d4c15b4c56;p=lilypond.git

diff --git a/configure.in b/configure.in
index 74a27bbfa8..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
@@ -99,6 +99,7 @@ STEPMAKE_GCC_OR_CLANG(REQUIRED, 3.4)
 
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX_OR_CLANG(REQUIRED, 3.4)
+STEPMAKE_GXXCODEGENBUG
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)
@@ -128,12 +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([AC_LANG_PROGRAM([#include <cxxabi.h>],
-	    [abi::__cxa_demangle ("", 0, 0, 0)]);],
+	    [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])])
+	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"
@@ -199,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)