Doc: LM: Mention barcheck warnings in song example; nitpicks.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index f7547d17700abc95dfe531078ea1712d022b2f23..5177b33a67dc9e49bee7a34dcb9f2610b103b973 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
 dnl configure.in   -*-shell-script-*-
 dnl Process this file with autoconf to produce a configure script.
 
+AC_PREREQ(2.50)
+
 # Bootstrap the init proces.
 AC_INIT
 
@@ -28,12 +30,6 @@ AC_ARG_ENABLE(documentation,
     [DOCUMENTATION=$enableval])
 AC_SUBST(DOCUMENTATION)
 
-gui_b=no
-AC_ARG_ENABLE(gui,
-    [  --enable-gui            compile with experimental GNOME output.  Default: off],
-    [gui_b=$enableval])
-
-
 AC_ARG_WITH(ncsb-dir,
     [  --with-ncsb-dir=DIR     location of Century Schoolbook fonts.],
     [NCSB_DIR=$withval],
@@ -104,7 +100,7 @@ STEPMAKE_BISON(OPTIONAL, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_FLEXLEXER_LOCATION
-AC_LANG_C
+AC_LANG([C])
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
@@ -112,20 +108,24 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
 STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
+# check for 2 typedefs added in Guile 1.9
+save_CFLAGS="$CFLAGS"
+CFLAGS="$GUILE_CFLAGS $CFLAGS"
+AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn],
+              [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [],
+              [#include <libguile.h>])
+CFLAGS="$save_CFLAGS"
 
 ## check rational bugfix.
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$GUILE_CFLAGS $CPPFLAGS"
 AC_MSG_CHECKING(GUILE rational bugfix)
-AC_TRY_CPP(
-#include <libguile.h>
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libguile.h>
 #ifdef SCM_FRACTION_REDUCED_BIT
 #error
 #endif
-,
-AC_MSG_RESULT(ok),
-REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
-AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt))
+]])],[AC_MSG_RESULT(ok)],[REQUIRED="$REQUIRED GUILE-with-rational-bugfix"
+AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)])
 CPPFLAGS="$save_CPPFLAGS"
 
 
@@ -139,7 +139,7 @@ STEPMAKE_PATH_PROG(T1ASM, t1asm, REQUIRED)
 
 AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
 AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
+AC_CHECK_HEADERS([sstream])
 AC_LANG_POP(C++)
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
@@ -148,10 +148,6 @@ AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprin
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)
 
-if test "$gui_b" = "yes"; then
-    STEPMAKE_GTK2(gtk+-2.0, REQUIRED, 2.4.0)
-fi
-
 AC_MSG_CHECKING(whether to enable dynamic relocation)
 if test "$reloc_b" = "yes"; then
     AC_DEFINE(ARGV0_RELOCATION)
@@ -170,7 +166,6 @@ 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)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)