Fix 899.

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index 6253b66efd53e9c1f7032e9d0e7d0a5825b06a2d..3f3b4f4d7b83f3df2ffa77440f6000c34a0f5eed 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl configure.in   -*-shell-script-*-
-dnl Process this file with autoconf to produce a configure script. 
+dnl Process this file with autoconf to produce a configure script.
 
 # Bootstrap the init proces.
 AC_INIT
@@ -110,10 +110,15 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
-## should check for 1.8.2 ?  
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0)
-
+# 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"
@@ -122,7 +127,7 @@ AC_MSG_CHECKING(GUILE rational bugfix)
 AC_TRY_CPP(
 #include <libguile.h>
 #ifdef SCM_FRACTION_REDUCED_BIT
-#error 
+#error
 #endif
 ,
 AC_MSG_RESULT(ok),
@@ -133,7 +138,7 @@ CPPFLAGS="$save_CPPFLAGS"
 
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
-STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
 
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
 
@@ -141,7 +146,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