* mf/merge.pe.in: Set font names, version, license GPL.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 83ea307aa1309143380ec00b45f9a75a5ac6e4d5..68b3aca31de6f7036570692b3a2d7a6049476bf3 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])
 
@@ -53,6 +51,12 @@ STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
+# mftrace for generating pfa's, pfb's
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.0.27)
+
+# 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++)
@@ -84,7 +88,6 @@ 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
@@ -92,23 +95,27 @@ 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
 fi
 
+STEPMAKE_FREETYPE2
+STEPMAKE_PANGO
+
 ## 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)
 
 
@@ -117,7 +124,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}")