Misc small changes.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index d2b8289cad50bfff78f58adee652cf439ce5b417..94b6c22203a529e7f70ec991d21dbc1c19c6a92d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,12 +30,15 @@ AC_ARG_ENABLE(gui,
 # must come before any header checks
 STEPMAKE_COMPILE
 
+STEPMAKE_KPATHSEA
+
 STEPMAKE_PYTHON(REQUIRED,2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_LIB(REQUIRED)
+STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
 # 1.29 is required fr %locations, but I'm not sure it's enough --ns
 STEPMAKE_BISON(REQUIRED, 1.29)
@@ -47,47 +50,22 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
-STEPMAKE_KPATHSEA
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
 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_CHECK_HEADERS([assert.h libio.h sys/stat.h])
 AC_LANG_PUSH(C++)
 AC_CHECK_HEADERS([sstream])
 AC_LANG_POP(C++)
 AC_HEADER_STAT
 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
+AC_CHECK_FUNCS([fopencookie funopen gettext isinf memmem snprintf vsnprintf])
+
 
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2
@@ -96,6 +74,11 @@ fi
 STEPMAKE_FREETYPE2
 STEPMAKE_PANGO_FT2
 
+## TTFTOOL stuff
+AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",
+               TTFTOOL_ENDIAN="-DSMALLENDIAN")
+AC_SUBST(TTFTOOL_ENDIAN)
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
@@ -110,7 +93,6 @@ STEPMAKE_PERL(OPTIONAL)
 # 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)
 
 
 if test "$optimise_b" = yes; then
@@ -118,7 +100,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}")
 
 # Gather requirements and generate output.