* mf/feta-schrift.mf ("Trill (`tr')"): Fix typo.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index e2aa933081f9bbf8db9737994b6116cd0c3c5b08..d2b8289cad50bfff78f58adee652cf439ce5b417 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,8 +13,6 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 
 STEPMAKE_INIT
 
-
-
 # List a file that identifies your package.
 AC_CONFIG_SRCDIR([lily/main.cc])
 
@@ -39,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
@@ -53,6 +52,12 @@ STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
+
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
+
 
 AC_CHECK_HEADERS([assert.h sys/stat.h])
 AC_LANG_PUSH(C++)
@@ -69,40 +74,42 @@ if test -n "$ecb10"; then
     AC_MSG_RESULT([$ecb10])
 else
     AC_MSG_RESULT(no)
-    STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5')
-    AC_MSG_CHECKING([for old version of ec-fonts-mftraced])
-    ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null`
-    if test -n "$ecrm10"; then
-       AC_MSG_RESULT([$ecrm10])
-       AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer])
+    AC_MSG_CHECKING([for lmodern])
+    lmr10=`kpsewhich lmr10.pfb 2>/dev/null`
+    if test -n "$lmr10"; then
+       AC_MSG_RESULT([$lmr10])
+    else
+       STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5')
+       AC_MSG_CHECKING([for old version of ec-fonts-mftraced])
+       ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null`
+       if test -n "$ecrm10"; then
+           AC_MSG_RESULT([$ecrm10])
+           AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer])
+       fi
     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
 if test "$gui_b" = "yes"; then
-  STEPMAKE_GTK2
-  STEPMAKE_PANGO
+    STEPMAKE_GTK2
 fi
 
+STEPMAKE_FREETYPE2
+STEPMAKE_PANGO_FT2
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
 STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
-# mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
 
-# 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)
 
 
@@ -111,7 +118,6 @@ if test "$optimise_b" = yes; then
     AC_DEFINE(STRINGS_UTILS_INLINED)
 fi
 
-
 AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")