Spelling fixes in comments and documentation

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 7e5172ffe53be679902f7bdf6ea6d27c3dba45c5..b2fc7f4be7cfa6b7e845e56e8e901cef327d4155 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
@@ -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"
@@ -140,10 +163,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)