X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=aclocal.m4;h=1228f6ca29c6208a89c19bdf8aee3f651a9c3dcb;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=b15111dd0c097c640f4f737b73d6ee7c4f76d219;hpb=42952dd74fdb084ed0101ebf528ea0263277a902;p=lilypond.git diff --git a/aclocal.m4 b/aclocal.m4 index b15111dd0c..1228f6ca29 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1344,6 +1344,35 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ fi ]) +AC_DEFUN(STEPMAKE_PANGO_FT2_WITH_OTF_FEATURE, [ + PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, + have_pangoft2_with_otf_feature=yes, true) + if test "$have_pangoft2_with_otf_feature" = yes ; then + AC_DEFINE(HAVE_PANGO16) + AC_DEFINE(HAVE_PANGO_FT2) + AC_DEFINE(HAVE_PANGO_FT2_WITH_OTF_FEATURE) + # Do not pollute user-CPPFLAGS with configure-CPPFLAGS + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + CPPFLAGS="$CPPFLAGS $PANGO_FT2_CFLAGS" + LIBS="$PANGO_FT2_LIBS $LIBS" + AC_CHECK_HEADERS([pango/pangoft2.h]) + AC_CHECK_FUNCS([pango_ft2_font_map_create_context]) + AC_SUBST(PANGO_FT2_CFLAGS) + AC_SUBST(PANGO_FT2_LIBS) + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + else + # UGR + #r="lib$1-dev or $1-devel"e + r="libpango1.0-dev or pango?-devel" + ver="`pkg-config --modversion $1`" + STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (It is required if you'd like "]) + STEPMAKE_ADD_ENTRY($2, ["to use OpenType font feature. "]) + STEPMAKE_ADD_ENTRY($2, ["installed: $ver)"]) + fi +]) + AC_DEFUN(STEPMAKE_FONTCONFIG, [ PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true) if test "$have_fontconfig" = yes ; then