* mf/feta-bolletjes.mf: merge solfa heads into main note heads.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 371d75db0cbd723c5bd20689e4b4f09961ae8ac6..83ea307aa1309143380ec00b45f9a75a5ac6e4d5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@ STEPMAKE_INIT
 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,7 +46,7 @@ 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
@@ -63,6 +63,27 @@ 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
@@ -73,8 +94,8 @@ 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
+    STEPMAKE_PANGO
 fi
 
 ## Optional tools for building documentation, website, extra fonts.
@@ -87,7 +108,7 @@ STEPMAKE_PERL(OPTIONAL)
 STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
 
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
 AC_SUBST(MAKEINFO_VERSION)