* lily/include/music.hh (class Music): unvirtualize transpose().

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 4290614d1add3b024e1a4c09c71a3c892bf2cdb1..d2b8289cad50bfff78f58adee652cf439ce5b417 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,7 +37,8 @@ STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_LIB(REQUIRED)
 # Do not use bison 1.50 and 1.75.
-STEPMAKE_BISON(REQUIRED, 1.25)
+# 1.29 is required fr %locations, but I'm not sure it's enough --ns
+STEPMAKE_BISON(REQUIRED, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 AC_LANG_C
@@ -52,10 +53,10 @@ STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.27)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
 
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(FONTFORGE, fontforge, REQUIRED, 20041208)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
 
 
 AC_CHECK_HEADERS([assert.h sys/stat.h])
@@ -88,20 +89,13 @@ else
     fi
 fi
 
-# This is developer only anyway, help pkgconfig a bit
-export PKG_CONFIG_PATH
-PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CONFIG_PATH=$HOME/usr/pkg/gnome/lib/pkgconfig:$PKG_CONFIG_PATH
-PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
-
-STEPMAKE_FREETYPE2
-STEPMAKE_PANGO
-i
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2
 fi
 
+STEPMAKE_FREETYPE2
+STEPMAKE_PANGO_FT2
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
@@ -111,8 +105,11 @@ STEPMAKE_PERL(OPTIONAL)
 
 
 
-# new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
+# New makeinfo for multi-page website docs Simply always require new
+# makeinfo should avoid bug reports; if people want to build lily
+# without the docs, they can find this comment and use an older
+# makeinfo -- but hopefully won't report makeinfo problems.
+STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 AC_SUBST(MAKEINFO_VERSION)