summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2009-09-21 12:45:34 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2009-09-21 17:29:40 (GMT)
commit442564951e6ef8469f09c3e4a49288620db3a986 (patch)
tree1be3c7cbb2fa0edecb18a46336c81db6ae7269aa
parentea0c0dfa64f5c614bfd728f323d9b6731ee4898c (diff)
downloadQt-442564951e6ef8469f09c3e4a49288620db3a986.zip
Qt-442564951e6ef8469f09c3e4a49288620db3a986.tar.gz
Qt-442564951e6ef8469f09c3e4a49288620db3a986.tar.bz2
fontconfig config.test requires freetype2
when cross compiling, freetype2 include pathes were not used when compiling the fontconfig config.test. Fixed. Reviewed-by: Simon Hausmann
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index debd799..a9ad276 100755
--- a/configure
+++ b/configure
@@ -5149,9 +5149,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
# auto-detect FontConfig support
if [ "$CFG_FONTCONFIG" != "no" ]; then
- if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig 2>/dev/null; then
- QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig 2>/dev/null`
- QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig 2>/dev/null`
+ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists fontconfig --exists freetype2 2>/dev/null; then
+ QT_CFLAGS_FONTCONFIG=`$PKG_CONFIG --cflags fontconfig --cflags freetype2 2>/dev/null`
+ QT_LIBS_FONTCONFIG=`$PKG_CONFIG --libs fontconfig --libs freetype2 2>/dev/null`
else
QT_CFLAGS_FONTCONFIG=
QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"