* stepmake/aclocal.m4 (STEPMAKE_PANGO_FT2): Define HAVE_PANGO16 too.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index f9ba2e2fabbaa908228f73d6947f11b8b34d1715..b99fff5fa3e588be5b5a9db5d4cc69661839c449 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,12 +19,6 @@ AC_CONFIG_SRCDIR([lily/main.cc])
 # Move to aclocal.m4?
 AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
-AC_C_BIGENDIAN(CFLAGS="$CFLAGS -DBIGENDIAN",
-               CFLAGS="$CFLAGS -DSMALLENDIAN")
-              
-              
-
-
 # Uncomment the configuration options your package needs.
 
 
@@ -36,15 +30,18 @@ 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)
+STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 AC_LANG_C
@@ -54,29 +51,40 @@ 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_LANG_PUSH(C++)
-1AC_CHECK_HEADERS([sstream])
+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_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
 
-
+STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 if test "$gui_b" = "yes"; then
-    STEPMAKE_GTK2
+    STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
+else
+    STEPMAKE_GTK2(gtk+-2.0, OPTIONAL, 2.4.0)
 fi
 
-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",
+               TTFTOOL_ENDIAN="-DSMALLENDIAN")
+AC_SUBST(TTFTOOL_ENDIAN)
 
 ## Optional tools for building documentation, website, extra fonts.
 
@@ -85,14 +93,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