X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.ac;h=ca151e70f3f4fdfca196a9bb671ba177e1024da8;hb=6089615c24e374ba2902e9a31940e1e8fe04a539;hp=2ae2f6cbb938c2a245e9a66b1dbdb9a828f1b1e6;hpb=23108a9515e7f76b44fac0b323afb169d708bfa1;p=lilypond.git

diff --git a/configure.ac b/configure.ac
index 2ae2f6cbb9..ca151e70f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,11 +26,17 @@ AC_ARG_ENABLE(documentation,
     [DOCUMENTATION=$enableval])
 AC_SUBST(DOCUMENTATION)
 
-AC_ARG_WITH(ncsb-dir,
-    [AS_HELP_STRING([--with-ncsb-dir=DIR],
-		    [location of Century Schoolbook fonts.])],
-    [NCSB_DIR=$withval],
-    [NCSB_DIR=""])
+GUILEv2=no
+AC_ARG_ENABLE(guile2,
+    [AS_HELP_STRING([--enable-guile2],
+		    [highly experimental GUILE 2 support.  Default: off])],
+    [GUILEv2=$enableval])
+
+AC_ARG_WITH(texgyre-dir,
+    [AS_HELP_STRING([--with-texgyre-dir=DIR],
+		    [location of TeX Gyre fonts.])],
+    [TEXGYRE_DIR=$withval],
+    [TEXGYRE_DIR=""])
 
 reloc_b=no
 AC_ARG_ENABLE(relocation,
@@ -55,49 +61,52 @@ AC_SUBST(LINK_GXX_STATICALLY)
 STEPMAKE_COMPILE
 
 AC_CHECK_PROG(FCLIST, fc-list, fc-list)
-AC_MSG_CHECKING([New Century Schoolbook PFB files])
-AC_SUBST(NCSB_SOURCE_FILES)
-AC_SUBST(NCSB_DIR)
-UNCHECKED_NCSB_SOURCE_FILES=""
-if test "$NCSB_DIR" != "" ;  then
-  for f in c059013l c059016l c059033l c059036l; do
-    if test ! -f "$NCSB_DIR/$f.pfb"; then
-      STEPMAKE_WARN($NCSB_DIR does not contain $f.pfb.)
+AC_MSG_CHECKING([for TeX Gyre fonts OTF files])
+AC_SUBST(TEXGYRE_DIR)
+AC_SUBST(TEXGYRE_FILES)
+if test "$TEXGYRE_DIR" = ""; then
+  if test "$FCLIST" != ""; then
+    TEXGYRE_FILE=`$FCLIST "TeX Gyre Schola:fontformat=CFF" file | head -n 1`
+    if test "$TEXGYRE_FILE" != ""; then
+      TEXGYRE_FILE=`echo $TEXGYRE_FILE | sed 's/\(:.*\)$//g'`
+      TEXGYRE_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $TEXGYRE_FILE`
+      TEXGYRE_DIR=`AS_DIRNAME($TEXGYRE_FILE)`
+    fi
+  fi
+fi
+if test "$TEXGYRE_DIR" != "" ;  then
+  for f in texgyreschola-regular.otf texgyreschola-italic.otf \
+           texgyreschola-bold.otf texgyreschola-bolditalic.otf \
+           texgyreheros-regular.otf texgyreheros-italic.otf \
+           texgyreheros-bold.otf texgyreheros-bolditalic.otf \
+           texgyrecursor-regular.otf texgyrecursor-italic.otf \
+           texgyrecursor-bold.otf texgyrecursor-bolditalic.otf; do
+    if test ! -f "$TEXGYRE_DIR/$f"; then
+      MISSING_TEXGYRE_FILES="$MISSING_TEXGYRE_FILES $f"
     else
-      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_DIR/$f.pfb $UNCHECKED_NCSB_SOURCE_FILES"
+      TEXGYRE_FILES="$TEXGYRE_FILES $f"
     fi
   done
-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 \
-                | head -n 1`
-      NCSB_FILE=`echo $NCSB_FILE | sed 's/\(:.*\)$//g'`
-      NCSB_FILE=`$PYTHON "$srcdir/scripts/auxiliar/readlink.py" $NCSB_FILE`
-      UNCHECKED_NCSB_SOURCE_FILES="$NCSB_FILE $UNCHECKED_NCSB_SOURCE_FILES"
-    done
-    NCSB_DIR=`AS_DIRNAME($NCSB_FILE)`
-  else
-    AC_MSG_RESULT(not found)
-    echo "Can't find Century Schoolbook files. Install FontConfig's fc-list,"
-    echo "or use --with-ncsb-dir"
-    STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts)
-  fi
 fi
-NCSB_SOURCE_FILES=""
-for f in $UNCHECKED_NCSB_SOURCE_FILES; do
-  if test "`grep Cyrillic "$f"`" = ""; then
-    STEPMAKE_WARN($f does not have Cyrillic characters.)
-    STEPMAKE_ADD_ENTRY(REQUIRED,International New Century Schoolbook fonts)
+if test "$TEXGYRE_DIR" = "" -o "$MISSING_TEXGYRE_FILES" != ""; then
+  AC_MSG_RESULT(no)
+  STEPMAKE_ADD_ENTRY(REQUIRED,TeX Gyre fonts OTF)
+  if test "$TEXGYRE_DIR" = ""; then
+    if test "$FCLIST" = ""; then
+      STEPMAKE_ADD_ENTRY(REQUIRED,'(install the fc-list utility from FontConfig, or use --with-texgyre-dir)')
+    else
+      STEPMAKE_ADD_ENTRY(REQUIRED,"(make sure the fc-list utility can see them, e.g. 'sudo apt-get install fonts-texgyre', or use --with-texgyre-dir)")
+    fi
   else
-    NCSB_SOURCE_FILES="$f $NCSB_SOURCE_FILES"
+    STEPMAKE_ADD_ENTRY(REQUIRED,'(these files are missing: $MISSING_TEXGYRE_FILES)')
   fi
-done
-AC_MSG_RESULT($NCSB_SOURCE_FILES)
+else
+  AC_MSG_RESULT(yes)
+fi
 
 AC_LANG([C++])
 
-STEPMAKE_PYTHON(REQUIRED, 2.4)
+STEPMAKE_PYTHON(REQUIRED, 2.4, 3.0)
 # this checks if we have GNU C by compiling a program with
 # __GNUC__, but that macro now unofficially means "the compiler
 # supports the GNU C extensions" -- the intel C compiler and clang
@@ -113,7 +122,7 @@ STEPMAKE_LIB(REQUIRED)
 STEPMAKE_DLOPEN
 # Do not use bison 1.50 and 1.75.
 # 1.29 is required fr %locations, but I'm not sure it's enough --ns
-STEPMAKE_BISON(OPTIONAL, 1.29)
+STEPMAKE_BISON(REQUIRED, 1.29)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_FLEXLEXER_LOCATION
@@ -121,8 +130,13 @@ STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF(REQUIRED)
-STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
+STEPMAKE_TEXMF_DIRS(REQUIRED)
+if test "$GUILEv2" = "yes"
+then
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.2.0)
+else
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
+fi
 
 # check for 3 typedefs added in Guile 1.9
 save_CXXFLAGS="$CXXFLAGS"
@@ -166,7 +180,7 @@ AC_MSG_RESULT(Must have patched GUILE rational support. See INSTALL.txt)])
 CPPFLAGS="$save_CPPFLAGS"
 
 
-STEPMAKE_PYTHON_DEVEL(REQUIRED)
+STEPMAKE_PYTHON_DEVEL(REQUIRED, 2.4, 3.0)
 
 STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20110222)
 
@@ -205,10 +219,10 @@ STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 STEPMAKE_WINDOWS
 
 # guile executable for some scripts
-STEPMAKE_GUILE(OPTIONAL)
+STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
 
-# perl for help2man.
-STEPMAKE_PERL(OPTIONAL)
+# perl for help2man and for mf2pt1.pl
+STEPMAKE_PERL(REQUIRED)
 
 ## Optional tools for building documentation, website, extra fonts.
 if test "$DOCUMENTATION" = "yes"; then