X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=9323c37602c58aaea8ee3ca041e8f15157bdd6e9;hb=ae0484ae139f4de639f91e64a3788583e5f84d87;hp=fa4569390876e4bb02c60df92f8496f99bbab6a2;hpb=3bca582c97181b5936c639ff87e1caffdc78c1bd;p=lilypond.git

diff --git a/configure.in b/configure.in
index fa45693908..9323c37602 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)
 
@@ -29,9 +30,16 @@ 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])
 
+
+NCSB_DIR=unknown
+AC_ARG_WITH(ncsb-dir,
+[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
+                            Default: detect with locate(1)],
+    [NCSB_DIR=$withval])
+
 reloc_b=no
 AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
@@ -46,13 +54,12 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-STEPMAKE_KPATHSEA
-
-STEPMAKE_PYTHON(REQUIRED, 2.2)
-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.
@@ -67,13 +74,13 @@ 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.15)
 
-STEPMAKE_PROGS(MFTRACE, mftrace, REQUIRED, 1.1.9)
+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])
@@ -97,6 +104,31 @@ if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
 fi
 
+AC_MSG_CHECKING([New Century Schoolbook PFB files])
+if test "$NCSB_DIR" = "unknown"; then
+  # use `type' command rather than external program `which'
+  type locate >& /dev/null
+  if test "$?" = "0"; then
+      for d in `locate c059033l.pfb `; do
+	  if test -f `dirname "$d"`/c059033l.afm ; then
+	      NCSB_DIR=`dirname "$d"`
+	      break 
+	  fi
+      done
+      if test "$NCSB_DIR" = "unknown";  then
+	  AC_MSG_WARN(Could not find c059033l.pfb. Use --enable-ncsb-path to set path)
+      fi
+  else
+     AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb)
+  fi
+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)
@@ -118,11 +150,6 @@ STEPMAKE_PERL(OPTIONAL)
 # 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.