Doc-de: fix linkage

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index de37814012d5ff287628a84722890d41a045d881..f7638ad389e4b837a314fde6f2c39cdb6d809a3f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -112,14 +112,25 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
-# check for 2 typedefs added in Guile 1.9
+# check for 3 typedefs added in Guile 1.9
 save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS"
 AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn],
               [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [],
               [#include <libguile.h>])
+AC_CHECK_TYPES([scm_t_subr],
+              [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [],
+              [#include <libguile.h>])
 CXXFLAGS="$save_CXXFLAGS"
 
+## Check for usable cxxabi
+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)],
+    [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])
+
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
@@ -137,10 +148,8 @@ STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
 
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
-# For svg woff fonts to work, version 20100501 is required but
-# the build does not break; leave optional until distros ship it.
-STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20100501)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20100501)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, OPTIONAL, 20110222)
 
 STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)