X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.ac;h=8e3cabe01efe4359f5e51c57c47b0bd608e44ce4;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=19ffd18bf31663cda5177993589e8f7d6edcb405;hpb=855e8e36a0c75aa75076fabe19aa292a6902ec96;p=lilypond.git

diff --git a/configure.ac b/configure.ac
index 19ffd18bf3..8e3cabe01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,8 +127,8 @@ if test "$URWOTF_DIR" != "" ;  then
            C059-Italic.otf C059-Roman.otf \
            NimbusMonoPS-Bold.otf NimbusMonoPS-BoldItalic.otf \
            NimbusMonoPS-Italic.otf NimbusMonoPS-Regular.otf \
-           NimbusSans-Bold.otf NimbusSans-BoldOblique.otf \
-           NimbusSans-Oblique.otf NimbusSans-Regular.otf; do
+           NimbusSans-Bold.otf NimbusSans-BoldItalic.otf \
+           NimbusSans-Italic.otf NimbusSans-Regular.otf; do
     if test ! -f "$URWOTF_DIR/$f"; then
       MISSING_URWOTF_FILES="$MISSING_URWOTF_FILES $f"
     else
@@ -136,6 +136,12 @@ if test "$URWOTF_DIR" != "" ;  then
     fi
   done
 fi
+if test "$MISSING_URWOTF_FILES"="NimbusSans-BoldItalic.otf NimbusSans-Italic.otf" && \
+   test -f "$URWOTF_DIR/NimbusSans-BoldOblique.otf" && \
+   test -f "$URWOTF_DIR/NimbusSans-Oblique.otf"; then
+  MISSING_URWOTF_FILES=""
+  URWOTF_FILES="$URWOTF_FILES NimbusSans-BoldOblique.otf NimbusSans-Oblique.otf"
+fi
 if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then
   AC_MSG_RESULT(no)
   STEPMAKE_ADD_ENTRY(OPTIONAL,URW++ OTF fonts)
@@ -143,7 +149,7 @@ if test "$URWOTF_DIR" = "" -o "$MISSING_URWOTF_FILES" != ""; then
     if test "$FCLIST" = ""; then
       STEPMAKE_ADD_ENTRY(OPTIONAL,'(install the fc-list utility from FontConfig, or use --with-urwotf-dir)')
     else
-      STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=commit;h=79bcdfb34fbce12b592cce389fa7a19da6b5b018' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
+      STEPMAKE_ADD_ENTRY(OPTIONAL,"(download OTF files from 'http://git.ghostscript.com/?p=urw-core35-fonts.git;a=tree;hb=1f28a6fcd2176256a995db907d9ffe6e1b9b83e9' and put them under '~/.local/share/fonts' etc., or use --with-urwotf-dir)")
     fi
   else
     STEPMAKE_ADD_ENTRY(OPTIONAL,'(these files are missing: $MISSING_URWOTF_FILES)')
@@ -181,7 +187,7 @@ STEPMAKE_TEXMF(REQUIRED)
 STEPMAKE_TEXMF_DIRS(REQUIRED)
 if test "$GUILEv2" = "yes"
 then
-    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.2.0)
+    STEPMAKE_GUILE_DEVEL(REQUIRED, 2.0.7, 2.3.0)
 else
     STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2, 1.9.0)
 fi
@@ -260,14 +266,22 @@ AC_MSG_RESULT($rpath_b)
 HOST_ARCH=`$CC -dumpmachine`
 AC_SUBST(HOST_ARCH)
 
-STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
+STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE(pangoft2, OPTIONAL, 1.38.0)
+if test "$have_pangoft2_with_otf_feature" != yes ; then
+    STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
+fi
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.4.0)
 STEPMAKE_FREETYPE2(freetype2, REQUIRED, 2.1.10)
 
 STEPMAKE_WINDOWS
 
 # guile executable for some scripts
-STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+if test "$GUILEv2" = "yes"
+then
+    STEPMAKE_GUILE(OPTIONAL, 2.0.7, 2.3.0)
+else
+    STEPMAKE_GUILE(OPTIONAL, 1.8.2, 1.9.0)
+fi
 
 # perl for help2man and for mf2pt1.pl
 STEPMAKE_PERL(REQUIRED)
@@ -281,6 +295,30 @@ fi
 
 STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, $DOCUMENTATION_REQUIRED, 8.60)
 
+AC_SUBST(GS920)
+AC_SUBST(EXTRACTPDFMARK)
+AC_SUBST(USE_EXTRACTPDFMARK)
+STEPMAKE_PROGS(GS920, gs, OPTIONAL, 9.20)
+STEPMAKE_PROGS(EXTRACTPDFMARK, extractpdfmark, OPTIONAL)
+req=`STEPMAKE_NUMERIC_VERSION(9.20)`
+USE_EXTRACTPDFMARK=yes
+if test "$GS920_VERSION" -lt "$req"; then
+    GS920=
+    USE_EXTRACTPDFMARK=no
+fi
+if test "$EXTRACTPDFMARK" != "extractpdfmark"; then
+    EXTRACTPDFMARK=
+    USE_EXTRACTPDFMARK=no
+fi
+if test "$USE_EXTRACTPDFMARK" != "yes"; then
+    STEPMAKE_ADD_ENTRY(OPTIONAL,
+        ["(Optionally using Ghostscript >= 9.20 together with"])
+    STEPMAKE_ADD_ENTRY(OPTIONAL,
+        [" Extract PDFmark can significantly reduce the disk space required"])
+    STEPMAKE_ADD_ENTRY(OPTIONAL,
+        [" for building the documentation and the final PDF files.)"])
+fi
+
 STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 STEPMAKE_PROGS(TEXI2HTML, texi2html, $DOCUMENTATION_REQUIRED, 1.82)
 STEPMAKE_PROGS(DBLATEX, dblatex, $DOCUMENTATION_REQUIRED, 0.1.4)