X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.in;h=6253b66efd53e9c1f7032e9d0e7d0a5825b06a2d;hb=3332fc2677f9c8d472ebe4adf05cc742a0089432;hp=d45c4c0a44ebe77acf8871f7d0dc3a037d52783b;hpb=7b547705955f52511ed20231b7f672c71ffb91cf;p=lilypond.git

diff --git a/configure.in b/configure.in
index d45c4c0a44..6253b66efd 100644
--- a/configure.in
+++ b/configure.in
@@ -58,7 +58,7 @@ AC_SUBST(LINK_GXX_STATICALLY)
 # must come before any header checks
 STEPMAKE_COMPILE
 
-AC_CHECK_PROG(FCMATCH, fc-match, fc-match)
+AC_CHECK_PROG(FCLIST, fc-list, fc-list)
 AC_MSG_CHECKING([New Century Schoolbook PFB files])
 AC_SUBST(NCSB_SOURCE_FILES)
 if test "$NCSB_DIR" != "" ;  then
@@ -71,17 +71,17 @@ if test "$NCSB_DIR" != "" ;  then
     fi
   done
 else
-  if test "$FCMATCH" != ""; then
+  if test "$FCLIST" != ""; then
     for style in Roman Italic "Bold Italic" Bold; do
-      NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style:foundry=urw" | grep 'file:' | grep -v "\.ttf"`
-
-      NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
+      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"
     done
   else
     AC_MSG_RESULT(not found)
-    echo "Can't find Century Schoolbook files. Install FontConfig's fc-match,"
+    echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
     echo "or use --with-ncsb-dir"
   fi
 fi
@@ -146,9 +146,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)
 
@@ -189,7 +187,7 @@ STEPMAKE_GUILE(OPTIONAL)
 STEPMAKE_PERL(OPTIONAL)
 
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
-STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.80)
+STEPMAKE_PROGS(TEXI2HTML, texi2html, OPTIONAL, 1.82)
 
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
@@ -205,6 +203,11 @@ STEPMAKE_END
 
 test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc=""
 
+if make top-doc 1>/dev/null 2>&1; then
+    rm -f INSTALL.txt && ln Documentation/topdocs/out/INSTALL.txt .
+    rm -f README.txt && ln Documentation/topdocs/out/README.txt .
+fi
+
 cat <<EOF
 
 Type: