(Top): add tie NEWS.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index fa4569390876e4bb02c60df92f8496f99bbab6a2..a4910f113011e8454a631feb56679b75cb2239e0 100644 (file)
--- 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)
 
@@ -32,11 +33,32 @@ AC_ARG_ENABLE(gui,
     [  --enable-gui            compile with experimental GNOME output module.  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],
     [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],
@@ -46,8 +68,6 @@ 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_CXX(REQUIRED)
@@ -97,6 +117,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)