From 74fd4c9581f7f38c27cf5c2e37066cdfc67316f1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 22 Feb 2004 01:02:57 +0000 Subject: [PATCH] Add a check for a new enough fontconfig, since we picked up a direct Sun Feb 22 02:04:03 2004 Matthias Clasen * configure.in: Add a check for a new enough fontconfig, since we picked up a direct dependency on it with the Xft settings. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 7 +++++++ 6 files changed, 32 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2e7bb78db..90e2cb9b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Feb 22 02:04:03 2004 Matthias Clasen + + * configure.in: Add a check for a new enough fontconfig, since + we picked up a direct dependency on it with the Xft settings. + Sun Feb 22 00:23:40 2004 Matthias Clasen Bug 112647 (Bill Haneman, patch by Narayana Pattipati): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2e7bb78db..90e2cb9b7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Feb 22 02:04:03 2004 Matthias Clasen + + * configure.in: Add a check for a new enough fontconfig, since + we picked up a direct dependency on it with the Xft settings. + Sun Feb 22 00:23:40 2004 Matthias Clasen Bug 112647 (Bill Haneman, patch by Narayana Pattipati): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2e7bb78db..90e2cb9b7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Feb 22 02:04:03 2004 Matthias Clasen + + * configure.in: Add a check for a new enough fontconfig, since + we picked up a direct dependency on it with the Xft settings. + Sun Feb 22 00:23:40 2004 Matthias Clasen Bug 112647 (Bill Haneman, patch by Narayana Pattipati): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2e7bb78db..90e2cb9b7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Feb 22 02:04:03 2004 Matthias Clasen + + * configure.in: Add a check for a new enough fontconfig, since + we picked up a direct dependency on it with the Xft settings. + Sun Feb 22 00:23:40 2004 Matthias Clasen Bug 112647 (Bill Haneman, patch by Narayana Pattipati): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2e7bb78db..90e2cb9b7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Feb 22 02:04:03 2004 Matthias Clasen + + * configure.in: Add a check for a new enough fontconfig, since + we picked up a direct dependency on it with the Xft settings. + Sun Feb 22 00:23:40 2004 Matthias Clasen Bug 112647 (Bill Haneman, patch by Narayana Pattipati): diff --git a/configure.in b/configure.in index bf1904ca9..a592689a8 100644 --- a/configure.in +++ b/configure.in @@ -991,6 +991,13 @@ if test "x$gdktarget" = "xlinux-fb" || test "x$gdktarget" = "xx11" ; then fi if test "x$gdktarget" = "xx11"; then + # + # Check for fontconfig + # + if $PKG_CONFIG --exists 'fontconfig >= 2.2.91' ; then : ; else + AC_MSG_ERROR([fontconfig 2.2.91 is required for x11 target]) + fi + # We start off with the libraries from Pango ## be sure we also have Pango built with Xft2 support