X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=configure.ac;h=11addfb70044067bb4966f864519f2113a2ffb1f;hb=750b714488c5af6eae22d07163bba8b554734ac6;hp=d77ea1588120c1dccbf0980cded2798251579cc5;hpb=fe4e0f1ceb493437ff510565aa7c501ea959d0a7;p=lilypond.git

diff --git a/configure.ac b/configure.ac
index d77ea15881..11addfb700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,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 +260,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)