From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 5 Oct 2012 04:22:42 +0000 (-0700)
Subject: configure.ac: Increase pango minimum version from 1.20 to 1.22
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20121008030504%2Fpspp;p=pspp

configure.ac: Increase pango minimum version from 1.20 to 1.22

Commit bd4d6e7453 (cairo: Avoid deprecated
pango_cairo_font_map_create_context().) added a dependency on pango
version 1.22 or later, but configure.ac only checked for version 1.20
or later.  This commit fixes the discrepancy.

INSTALL already documented that Pango 1.22 or later was needed.

Reported by John Darrington.
---

diff --git a/configure.ac b/configure.ac
index 2f3a8da725..ec5ee2eae2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,11 +56,11 @@ AC_ARG_WITH([cairo],
   [], [with_cairo=yes])
 AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no])
 if test "$with_cairo" != no; then
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], 
+  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo],
     [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS"
      AC_DEFINE([HAVE_CAIRO], 1, 
        [Define to 1 if Cairo and Pango are available.])],
-    [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])])
+    [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])])
   AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH])
   AC_SUBST(XMLLINT)
 fi