(make_standard_accidental): only add

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 4dd5c2d40b1cb797764fc97f1ea5cbbfab7661c7..92e53a0515b60248432b49ee6b306dee702a322c 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_WITH(ncsb,
+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],
@@ -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.
@@ -139,6 +126,9 @@ 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)
@@ -160,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.