Check pango-querymodules-32 if pango-querymodules

is not available.

diff --git a/configure.ac b/configure.ac
index f90477c..46e6c4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,11 +43,19 @@ dnl Check for Pango.
 PKG_CHECK_MODULES(PANGO, pango >= 1.4.0)
 PKG_CHECK_MODULES(PANGOFT2, pangoft2 >= 1.4.0)
 AC_CHECK_PROG(HAVE_PANGO_QMODULE, pango-querymodules, yes)
-if test "x$HAVE_PANGO_QMODULE" != "xyes"; then
-  exit 1
+if test "x$HAVE_PANGO_QMODULE" == "xyes"; then
+  PANGO_QUERYMODULES=pango-querymodules
+else
+  AC_CHECK_PROG(HAVE_PANGO_QMODULE, pango-querymodules-32, yes)
+  if test "x$HAVE_PANGO_QMODULE" == "xyes"; then
+    PANGO_QUERYMODULES=pango-querymodules-32
+  else
+    exit 1
+  fi
 fi
 PANGO_MODULE_VERSION=1.4.0
 AC_SUBST(PANGO_MODULE_VERSION)
+AC_SUBST(PANGO_QUERYMODULES)
 
 AC_CONFIG_FILES([Makefile])