* stepmake/stepmake/*:

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index faa182f2e403bca2379c192666d931e6f8efc127..beefed504c772d5763ba1fe4ce98e07d340ccba9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -32,12 +32,18 @@ AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
     [reloc_b=$enableval])
 
+AC_SUBST(LINK_GXX_STATICALLY)
+LINK_GXX_STATICALLY=no
+AC_ARG_ENABLE(static-gxx,
+    [  --enable-static-gxx     link libstdc++.a statically. Default: off],
+    [LINK_GXX_STATICALLY=$enableval])
+
 # must come before any header checks
 STEPMAKE_COMPILE
 
 STEPMAKE_KPATHSEA
 
-STEPMAKE_PYTHON(REQUIRED, 2.1)
+STEPMAKE_PYTHON(REQUIRED, 2.2)
 STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 3.0.5)
@@ -60,9 +66,9 @@ STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
-STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.14)
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
 
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.1)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
@@ -79,16 +85,16 @@ AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 if test "$gui_b" = "yes"; then
     STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
-fi # $gui_b
+fi
 
 if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
-fi # $reloc_b
+fi
 
-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)
+#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
 
 STEPMAKE_WINDOWS
 
@@ -103,7 +109,7 @@ 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.
+# makeinfo--but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 
 if test "$optimise_b" = yes; then