From 016ab238b66d84a58b665782d25daaffdf1708bd Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 7 Dec 2017 11:59:30 +0100
Subject: configure: express dependency of fontconfig on freetype more clearly

use a "use" entry instead of including the transitive dep into the list
of libraries.
this also removes the redundant check of freetype features from the
fontconfig test code.

Change-Id: I86b78028255c9bf0a62be5ec0f97a62ef3fda36f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/gui/configure.json | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/configure.json b/src/gui/configure.json
index f7377eb903..1e4e56422f 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -164,25 +164,20 @@
             "label": "Fontconfig",
             "test": {
                 "head": [
-                    "#include <ft2build.h>",
-                    "#include FT_FREETYPE_H",
                     "#include <fontconfig/fontconfig.h>",
                     "#ifndef FC_RGBA_UNKNOWN",
                     "#  error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
-                    "#endif",
-                    "#if ((FREETYPE_MAJOR*10000 + FREETYPE_MINOR*100 + FREETYPE_PATCH) < 20110)",
-                    "#  error This version of freetype is too old.",
                     "#endif"
                 ],
                 "main": [
-                    "FT_Face face = 0;",
                     "FcPattern *pattern = 0;"
                 ]
             },
             "sources": [
-                { "type": "pkgConfig", "args": "fontconfig freetype2" },
-                { "type": "freetype", "libs": "-lfontconfig -lfreetype" }
-            ]
+                { "type": "pkgConfig", "args": "fontconfig" },
+                { "type": "freetype", "libs": "-lfontconfig" }
+            ],
+            "use": "freetype"
         },
         "gbm": {
             "label": "GBM",
-- 
cgit v1.2.3