use a configure test for pango-fontconfig support

   (to fix issue where windows has fontconfig, but pango not built to use it)

diff --git a/configure.ac b/configure.ac
index f8992c591673c48cf75ccc8758e1bd566e0d4e8a..b1ef832e85227fc8fc28c6dd0e142c47c9f18ff2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1689,6 +1689,14 @@ AC_SUBST(PANGOCAIRO_LIBS)
 fi
 AM_CONDITIONAL(WITH_PANGOCAIRO, [test "x$HAVE_PANGOCAIRO" != "x"])
 
+# see if pango uses a fontconfig/freetype2 backend
+if test "x$HAVE_PANGOCAIRO" != "x"; then
+    save_LIBS=$LIBS
+    LIBS="$LIBS $PANGOCAIRO_LIBS"
+    AC_CHECK_FUNCS([pango_fc_font_lock_face pango_fc_font_unlock_face])
+    LIBS=$save_LIBS
+fi
+
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GLITZ
                                                                                 

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 620722a200e237784c7a12e37cbaf35122683cf7..d9d54bd62ec4be707bb10dcd753f6d3684a03a28 100644 (file)
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_PANGOCAIRO
 #include <pango/pangocairo.h>
-#ifdef HAVE_FONTCONFIG
+#ifdef HAVE_PANGO_FC_FONT_LOCK_FACE
 #include <pango/pangofc-font.h>
 #endif
 
@@ -93,7 +93,7 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
            buf[0] = '\0';
            if (psfnt)
                strcat(buf, "(ps) ");
-#ifdef PANGO_TYPE_FC_FONT
+#ifdef HAVE_PANGO_FC_FONT_LOCK_FACE
            {
                FT_Face face;
                PangoFcFont *fcfont;