* mf/GNUmakefile (FC_FIND): new function. Find ncsb using

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 94d02af55d94c09bd25ce6030f47478d61e29347..0093d0a64c35f0c2f354fbed39876c8b8da608e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,33 +34,16 @@ AC_ARG_ENABLE(gui,
     [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])
-
+    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [NCSB_DIR=$withval],
+    )
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
     [  --enable-relocation     compile with dynamic relocation.  Default: off],
     [reloc_b=$enableval])
 
-FRAMEWORKDIR=".."
-AC_ARG_WITH(framework-dir,
-    [  --with-framework-dir=DIR
-                          relative location of framework],[
-       if test "$withval" = "yes" -o "$withval" = "no"; then
-           AC_MSG_WARN(Usage: --with-framework-dir=../lib/FRAMEWORK/DIR)
-       else
-           FRAMEWORKDIR="${withval}"
-           LDFLAGS="$LDFLAGS -Wl,--rpath,'\$\${ORIGIN}/$FRAMEWORKDIR/lib'"
-       fi
-       ])
-AC_DEFINE_UNQUOTED(FRAMEWORKDIR, ["${FRAMEWORKDIR}"])
-
 LINK_GXX_STATICALLY=no
 AC_ARG_ENABLE(static-gxx,
     [  --enable-static-gxx     link libstdc++.a statically. Default: off],
@@ -70,10 +53,10 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-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)
@@ -90,13 +73,14 @@ 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_PROGS(FCMATCH, fc-match, OPTIONAL, 2.1.0)
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
@@ -121,27 +105,20 @@ if test "$reloc_b" = "yes"; then
 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)
+
+if test "$NCSB_DIR" != "" ;  then
+  if  test ! -f "$NCSB_DIR/c059016l.pfb"; then
+      AC_MSG_WARN($NCSB_DIR does not contain c059033l.pfb. Use --with-ncsb-dir)
   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)
@@ -163,11 +140,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.