* Documentation/user/basic-notation.itely (Basic polyphony): fix

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index b4fce2da9b4ec76d51e8f47e17c5579a020029ad..bfa2d26df39e96f226d436fd55a261451853dc99 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,7 +30,9 @@ AC_ARG_ENABLE(gui,
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_PYTHON(REQUIRED,2.1)
+STEPMAKE_KPATHSEA
+
+STEPMAKE_PYTHON(REQUIRED, 2.1)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 3.0.5)
@@ -39,7 +41,7 @@ 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)
+STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 AC_LANG_C
@@ -49,29 +51,34 @@ STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
-STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.14)
+
 STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
 
-AC_CHECK_HEADERS([assert.h libio.h sys/stat.h])
+AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.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([fopencookie funopen gettext isinf memmem snprintf vsnprintf])
-
+AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
+AC_SEARCH_LIBS(wcrtomb, [mingwex msvcp60])
 
+STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 if test "$gui_b" = "yes"; then
-    STEPMAKE_GTK2
-fi
+    STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
+fi # $gui_b
 
-STEPMAKE_FREETYPE2
-STEPMAKE_PANGO_FT2
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
+#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
+STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
+STEPMAKE_FONTCONFIG(fontconfig, OPTIONAL, 2.2.0)
 
 ## TTFTOOL stuff
 AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",
@@ -85,14 +92,11 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 
-
-
 # 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)
 
 
 if test "$optimise_b" = yes; then