*** empty log message ***

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 34d9437082a41783bf2169d28f629656b434a2ae..7ca07e8c9d85bbe76b5ae536a39984619bd40b0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,35 +30,21 @@ 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_ENABLE(ncsb,
-[  --enable-ncsb-dir      set the path where Century Schoolbook fonts can be found.
+AC_ARG_WITH(ncsb-dir,
+[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
                             Default: detect with locate(1)],
-    [NCSB_DIR=$enableval])
-
+    [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 the optional framework directory],[
-       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],
@@ -73,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.
@@ -119,14 +106,18 @@ fi
 
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 if test "$NCSB_DIR" = "unknown"; then
-  which locate >& /dev/null
+  # use `type' command rather than external program `which'
+  type locate >& /dev/null
   if test "$?" = "0"; then
-      ## sort to give precedence to /usr/  
-      NCSB_DIR=`locate c059033l.pfb | sort -r | head -1`
-      if test "$NCSB_DIR" = "";  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
-      NCSB_DIR=`dirname "$NCSB_DIR"`
   else
      AC_MSG_WARN(Could not find locate(1). Use --enable-ncsb-path to set path to c059033l.pfb)
   fi
@@ -156,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.