[mf2pt1] Updated to version 2.5.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 8dc4e5ca9734a7d12a6edad272710fe8b8afcf84..0189be15b2aedb767832d777eccd8c6955dde845 100644 (file)
--- 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
@@ -129,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"
@@ -200,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)