*** empty log message ***

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 0c4041fdfaa774838bc8cfc9ce0a357e27dd0cb0..7ca07e8c9d85bbe76b5ae536a39984619bd40b0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,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],
@@ -52,6 +59,7 @@ STEPMAKE_GCC(REQUIRED, 2.8)
 STEPMAKE_CXX(REQUIRED)
 STEPMAKE_GXX(REQUIRED, 3.0.5)
 STEPMAKE_CXXTEMPLATE
+STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)
 STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
@@ -96,6 +104,28 @@ 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)
+
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
@@ -117,11 +147,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.