X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=2050b87336c5e885654e1756d4b94f9dd56dd10e;hb=d8d7985d6027b374744a7c88250b856c4ef7e619;hp=7e5172ffe53be679902f7bdf6ea6d27c3dba45c5;hpb=1419c2a9fd0ddf4d031948d58f9c03fbfc8f8435;p=lilypond.git

diff --git a/configure.in b/configure.in
index 7e5172ffe5..2050b87336 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
@@ -76,7 +76,7 @@ else
     for style in Roman Italic "Bold Italic" Bold; do
       NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \
                 | head -n 1`
-      NCSB_FILE=`echo $NCSB_FILE | sed 's/^\(.*\):$/\1/g'`
+      NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
@@ -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)
 
@@ -189,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)