revert the "fix".

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 8dc846f9a9fdaee8d15a983bef4203d7d8ce0f69..9323c37602c58aaea8ee3ca041e8f15157bdd6e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -33,25 +33,6 @@ AC_ARG_ENABLE(gui,
     [  --enable-gui            compile with experimental GNOME output.  Default: off],
     [gui_b=$enableval])
 
-std_string=yes
-AC_ARG_ENABLE(std-string,
-    [  --enable-std-string     compile with std::string.  Default: on],
-    [std_string=$enableval])
-if test "$std_string" = "yes"; then
-    # Store in config.make rather than in config.hh and have every
-    # source file depend on that.
-    DEFINES="$DEFINES -DSTD_STRING=1"
-fi
-
-std_vector=yes
-AC_ARG_ENABLE(std-string,
-    [  --enable-std-vector     compile with std::vector.  Default: on],
-    [std_vector=$enableval])
-if test "$std_vector" = "yes"; then
-    # Store in config.make rather than in config.hh and have every
-    # source file depend on that.
-    DEFINES="$DEFINES -DSTD_VECTOR=1"
-fi
 
 NCSB_DIR=unknown
 AC_ARG_WITH(ncsb-dir,
@@ -59,25 +40,11 @@ AC_ARG_WITH(ncsb-dir,
                             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],
@@ -87,10 +54,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)
@@ -107,13 +74,13 @@ 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_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
@@ -159,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)
@@ -180,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.