X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=f04530aa984de99235dbf9fa7bdc714ddeed5a75;hb=33c6cf0164f0df1d13806471170e76e76f509463;hp=2f68128636df8a0d58bdbb67d5998ebcabd6b9f8;hpb=9879bd7a67e4f72c6fa7f30eb355f2dc56f9a4bc;p=lilypond.git

diff --git a/configure.in b/configure.in
index 2f68128636..f04530aa98 100644
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,7 @@ AC_INIT
 # Bootstrap StepMake configure
 # For user package:
 AC_CONFIG_AUX_DIR([stepmake/bin])
+
 # For stepmake package:
 # AC_CONFIG_AUX_DIR(bin)
 
@@ -21,22 +22,43 @@ AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
+DOCUMENTATION=yes
+AC_ARG_ENABLE(documentation,
+    [  --enable-documentation  build Documentation.  Default: on],
+    [DOCUMENTATION=$enableval])
+AC_SUBST(DOCUMENTATION)
 
 gui_b=no
 AC_ARG_ENABLE(gui,
-    [  --enable-gui            compile with experimental GNOME output module.  Default: off],
+    [  --enable-gui            compile with experimental GNOME output.  Default: off],
     [gui_b=$enableval])
 
+
+AC_ARG_WITH(ncsb-dir,
+    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [NCSB_DIR=$withval],
+    [NCSB_DIR=/usr/share/fonts/default/Type1])
+
+reloc_b=no
+AC_ARG_ENABLE(relocation,
+    [  --enable-relocation     compile with dynamic relocation.  Default: off],
+    [reloc_b=$enableval])
+
+LINK_GXX_STATICALLY=no
+AC_ARG_ENABLE(static-gxx,
+    [  --enable-static-gxx     link libstdc++.a statically. Default: off],
+    [LINK_GXX_STATICALLY=$enableval])
+AC_SUBST(LINK_GXX_STATICALLY)
+
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_KPATHSEA
-
-STEPMAKE_PYTHON(REQUIRED, 2.1)
-STEPMAKE_GCC(REQUIRED, 2.8)
+STEPMAKE_PYTHON(REQUIRED, 2.3)
+STEPMAKE_GCC(REQUIRED, 4.0)
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.0.5)
+STEPMAKE_GXX(REQUIRED, 4.0)
 STEPMAKE_CXXTEMPLATE
+STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)
 STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
@@ -44,20 +66,21 @@ STEPMAKE_DLOPEN
 STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
+STEPMAKE_FLEXLEXER_LOCATION
 AC_LANG_C
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
-STEPMAKE_MAKEINFO(REQUIRED)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.7)
+STEPMAKE_MAKEINFO(REQUIRED, 4.8)
 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_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20041208)
+STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.19)
+STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
 AC_LANG_PUSH(C++)
@@ -71,19 +94,30 @@ AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
 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
 
-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)
+if test "$reloc_b" = "yes"; then
+    AC_DEFINE(ARGV0_RELOCATION)
+fi
 
-## TTFTOOL stuff
-AC_C_BIGENDIAN(TTFTOOL_ENDIAN="-DBIGENDIAN",
-               TTFTOOL_ENDIAN="-DSMALLENDIAN")
-AC_SUBST(TTFTOOL_ENDIAN)
+AC_MSG_CHECKING([New Century Schoolbook PFB files])
+if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
+    AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
+fi
+
+AC_MSG_RESULT($NCSB_DIR)
+AC_SUBST(NCSB_DIR)
+
+HOST_ARCH=`$CC -dumpmachine`
+AC_SUBST(HOST_ARCH)
+
+STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
+#STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FREETYPE2(freetype2, REQUIRED, 0)
 
 STEPMAKE_WINDOWS
 
@@ -91,27 +125,21 @@ STEPMAKE_WINDOWS
 
 # guile executable for some scripts
 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.
+# makeinfo--but hopefully won't report makeinfo problems.
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.7)
 
-
-if test "$optimise_b" = yes; then
-    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-    AC_DEFINE(STRINGS_UTILS_INLINED)
-fi
-
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 # Gather requirements and generate output.
 STEPMAKE_END
 
-
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
 
 cat <<EOF