From 00f88bd0902c852c334903d7437cb0f6e399471d Mon Sep 17 00:00:00 2001
From: Donald Carr <donald.carr@nokia.com>
Date: Mon, 4 Jun 2012 17:15:57 +0000
Subject: [PATCH] Migrate fontconfig config test to unix scope

Fontconfig has no X11 dependency and is of broader use to us than the X11
context. The test should also disambiguate whether fontconfig support is
successfully detected or not.

This change also removes a false X11 dependency from the freetype test.

Change-Id: I68a596aa06f614a64163772fe29a09edba119a81
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
---
 config.tests/{x11 => unix}/fontconfig/fontconfig.cpp | 0
 config.tests/{x11 => unix}/fontconfig/fontconfig.pro | 0
 config.tests/unix/freetype/freetype.pro              | 1 -
 configure                                            | 5 ++++-
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename config.tests/{x11 => unix}/fontconfig/fontconfig.cpp (100%)
 rename config.tests/{x11 => unix}/fontconfig/fontconfig.pro (100%)

diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp
similarity index 100%
rename from config.tests/x11/fontconfig/fontconfig.cpp
rename to config.tests/unix/fontconfig/fontconfig.cpp
diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro
similarity index 100%
rename from config.tests/x11/fontconfig/fontconfig.pro
rename to config.tests/unix/fontconfig/fontconfig.pro
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
index e84158e..c0cc02d 100644
--- a/config.tests/unix/freetype/freetype.pro
+++ b/config.tests/unix/freetype/freetype.pro
@@ -1,5 +1,4 @@
 SOURCES = freetype.cpp
-CONFIG += x11
 CONFIG -= qt
 LIBS += -lfreetype
 include(freetype.pri)
diff --git a/configure b/configure
index 17ea5b8..747ebf3 100755
--- a/configure
+++ b/configure
@@ -4535,11 +4535,14 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then
         QT_CFLAGS_FONTCONFIG=
         QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
     fi
-    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
         QT_CONFIG="$QT_CONFIG fontconfig"
         QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG"
         QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG"
+        CFG_FONTCONFIG=yes
         CFG_LIBFREETYPE=system
+    else
+        CFG_FONTCONFIG=no
     fi
 
 fi
-- 
2.7.4