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

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 371d75db0cbd723c5bd20689e4b4f09961ae8ac6..68b3aca31de6f7036570692b3a2d7a6049476bf3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -13,13 +13,11 @@ AC_CONFIG_AUX_DIR([stepmake/bin])
 
 STEPMAKE_INIT
 
-
-
 # List a file that identifies your package.
 AC_CONFIG_SRCDIR([lily/main.cc])
 
 # Move to aclocal.m4?
-AC_CONFIG_HEADER([$CONFIGFILE.h:config.hh.in])
+AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
@@ -46,13 +44,19 @@ AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
-STEPMAKE_TEXMF
+STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
 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++)
@@ -63,6 +67,26 @@ AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([gettext isinf memmem snprintf vsnprintf gettext])
 
+AC_MSG_CHECKING([for ec-fonts-mftraced])
+ecb10=`kpsewhich ecb10.pfa 2>/dev/null`
+if test -n "$ecb10"; then
+    AC_MSG_RESULT([$ecb10])
+else
+    AC_MSG_RESULT(no)
+    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
@@ -71,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
+    STEPMAKE_GTK2
 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.6)
+
+
+# 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)
 
 
@@ -96,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}")