Merge branch 'master' into lilypond/translation

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index cf7ac0535e5585a07667ef332874a91781ffe687..fcdaa5888425a80a46e794bd1d217aa1a06dec3a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in   -*-shell-script-*-
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.50)
+AC_PREREQ(2.60)
 
 # Bootstrap the init proces.
 AC_INIT
@@ -20,34 +20,39 @@ STEPMAKE_INIT
 AC_CONFIG_SRCDIR([lily/main.cc])
 
 # Move to aclocal.m4?
-AC_CONFIG_HEADER([$CONFIGFILE.hh:config.hh.in])
+AC_CONFIG_HEADERS([$CONFIGFILE.hh:config.hh.in])
 
 # Uncomment the configuration options your package needs.
 
 DOCUMENTATION=yes
 AC_ARG_ENABLE(documentation,
-    [  --enable-documentation  build Documentation.  Default: on],
+    [AS_HELP_STRING([--enable-documentation],
+                   [build Documentation.  Default: on])],
     [DOCUMENTATION=$enableval])
 AC_SUBST(DOCUMENTATION)
 
 AC_ARG_WITH(ncsb-dir,
-    [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
+    [AS_HELP_STRING([--with-ncsb-dir=DIR],
+                   [location of Century Schoolbook fonts.])],
     [NCSB_DIR=$withval],
     [NCSB_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
-    [  --enable-relocation     compile with dynamic relocation.  Default: off],
+    [AS_HELP_STRING([--enable-relocation],
+                   [compile with dynamic relocation.  Default: off])],
     [reloc_b=$enableval])
 
 rpath_b=no
 AC_ARG_ENABLE(rpath,
-    [  --enable-rpath          hardcode runtime library path.  Default: off],
+    [AS_HELP_STRING([--enable-rpath],
+                   [hardcode runtime library path.  Default: off])],
     [rpath_b=$enableval])
 
 LINK_GXX_STATICALLY=no
 AC_ARG_ENABLE(static-gxx,
-    [  --enable-static-gxx     link libstdc++.a statically. Default: off],
+    [AS_HELP_STRING([--enable-static-gxx],
+                   [link libstdc++.a statically.  Default: off])],
     [LINK_GXX_STATICALLY=$enableval])
 AC_SUBST(LINK_GXX_STATICALLY)
 
@@ -141,7 +146,7 @@ AC_CHECK_HEADERS([sstream])
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprintf wcrtomb])
+AC_CHECK_FUNCS([chroot fopencookie gettext isinf memmem snprintf vsnprintf])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 
@@ -163,7 +168,7 @@ HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
 
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
-STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)
+STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS