summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-03-02 10:43:55 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-03-02 10:43:55 +0000
commit51c9a94fd776a8e05918e60d2c29851b936c0b07 (patch)
tree19542b571c56937b48a923d8fa3160e6ea1bcc24 /Build/source/m4
parent8d25a8247e23c58faa1e92f1c849587d6b056cb8 (diff)
Require cairo-1.12 or better
git-svn-id: svn://tug.org/texlive/trunk@29268 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog4
-rw-r--r--Build/source/m4/kpse-cairo-flags.m44
2 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 1008ea90a7c..851509c2688 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-cairo-flags.m4: Require cairo-1.12 or better.
+
2013-01-30 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-common.m4: Enable subdir-objects.
diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4
index f957d78a850..86404e9e5dd 100644
--- a/Build/source/m4/kpse-cairo-flags.m4
+++ b/Build/source/m4/kpse-cairo-flags.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@ AC_DEFUN([KPSE_CAIRO_OPTIONS],
# ----------------------
AC_DEFUN([KPSE_CAIRO_SYSTEM_FLAGS],
[AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
-if $PKG_CONFIG cairo --atleast-version=1.10; then
+if $PKG_CONFIG cairo --atleast-version=1.12; then
CAIRO_INCLUDES=`$PKG_CONFIG cairo --cflags`
CAIRO_LIBS=`$PKG_CONFIG cairo --libs`
elif test "x$need_cairo:$with_system_cairo" = xyes:yes; then