Bug 1243073 - Require at least fontconfig 2.7.0 (for the FcConfigReference function). r=karlt
authorJonathan Kew <jkew@mozilla.com>
Mon, 15 Feb 2016 13:23:37 +0000
changeset 284509 0cf5df9fc05c834b0b3f9c8d0e130e05e7fe6e91
parent 284508 2fa44352d55cf1766d0c1b6668159c1f736e8d49
child 284510 f95c21f4dd507563eef8e861ed3fbc5051f7df49
push id19537
push userkwierso@gmail.com
push dateWed, 17 Feb 2016 19:16:23 +0000
treeherderb2g-inbound@0c04a9efadab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs1243073
milestone47.0a1
Bug 1243073 - Require at least fontconfig 2.7.0 (for the FcConfigReference function). r=karlt
configure.in
--- a/configure.in
+++ b/configure.in
@@ -71,16 +71,17 @@ GTK3_VERSION=3.4.0
 GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4
 WINDRES_VERSION=2.14.90
 W32API_VERSION=3.14
 GNOMEUI_VERSION=2.2.0
 GCONF_VERSION=1.2.1
 STARTUP_NOTIFICATION_VERSION=0.8
 DBUS_VERSION=0.60
 SQLITE_VERSION=3.10.2
+FONTCONFIG_VERSION=2.7.0
 
 MSMANIFEST_TOOL=
 
 dnl Set various checks
 dnl ========================================================
 MISSING_X=
 AC_PROG_AWK
 
@@ -8073,17 +8074,17 @@ if test "$USE_FC_FREETYPE"; then
         CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
         MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
             [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)], [#include <fontconfig/fontconfig.h>])
         CPPFLAGS="$_SAVE_CPPFLAGS"
     else
         AC_DEFINE(HAVE_FONTCONFIG_FCFREETYPE_H)
     fi
 
-    PKG_CHECK_MODULES(_FONTCONFIG, fontconfig,
+    PKG_CHECK_MODULES(_FONTCONFIG, fontconfig >= $FONTCONFIG_VERSION,
     [
         if test "$MOZ_PANGO"; then
             MOZ_PANGO_CFLAGS="$MOZ_PANGO_CFLAGS $_FONTCONFIG_CFLAGS"
             MOZ_PANGO_LIBS="$MOZ_PANGO_LIBS $_FONTCONFIG_LIBS"
         else
             FT2_CFLAGS="$FT2_CFLAGS $_FONTCONFIG_CFLAGS"
             FT2_LIBS="$FT2_LIBS $_FONTCONFIG_LIBS"
         fi