Merge branch 'master' into lilypond/translation

[lilypond.git] / configure.in

diff --git a/configure.in b/configure.in
index cf54338d7ff032543f3a85f4e4e8ff27b274c52e..f7547d17700abc95dfe531078ea1712d022b2f23 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
@@ -73,7 +73,8 @@ if test "$NCSB_DIR" != "" ;  then
 else
   if test "$FCLIST" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file`
+      NCSB_FILE=`$FCLIST "Century Schoolbook L:style=$style:foundry=urw:fontformat=Type 1" file \
+                | head -n 1`
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^\(.*\):$/\1/g'`
       NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
@@ -109,9 +110,7 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS
-
-## should check for 1.8.2 ?  
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
 
 
 ## check rational bugfix.
@@ -121,7 +120,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),
@@ -132,7 +131,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)
 
@@ -145,9 +144,7 @@ AC_LANG_POP(C++)
 AC_HEADER_STAT
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf mbrtowc memmem snprintf vsnprintf wcrtomb])
-AC_CHECK_HEADERS([utf8/wchar.h], LIBS="$LIBS -lutf8")
-AC_SEARCH_LIBS(mbrtowc, [mingwex msvcp60])
+AC_CHECK_FUNCS([chroot fopencookie funopen gettext isinf memmem snprintf vsnprintf wcrtomb])
 
 STEPMAKE_PROGS(PKG_CONFIG, pkg-config, REQUIRED, 0.9.0)