summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-13 03:07:33 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-13 03:07:33 +0100
commitca9d4d7d227386aba0f30bdacee1c5aa0a053204 (patch)
treed1bb08bf95cf59d75211279ba71b1900d0c28d74
parent5445c25f501f456239b299d2b8810e4beb97a4f3 (diff)
downloadtqt3-ca9d4d7d.tar.gz
tqt3-ca9d4d7d.zip
Fix FTBFS with libfreetype6 >= 2.5.x
This resolves Bug 1765
-rwxr-xr-xconfig.tests/x11/xfreetype.test5
1 files changed, 4 insertions, 1 deletions
diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test
index 5cabc329..d4cb4ba1 100755
--- a/config.tests/x11/xfreetype.test
+++ b/config.tests/x11/xfreetype.test
@@ -116,12 +116,15 @@ fi
# check for freetype2 headers
FREETYPE2_INCDIR=
if [ "$XFT" = "yes" ]; then
- INC="freetype2/freetype/freetype.h"
XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
F=
for INCDIR in $INCDIRS; do
+ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1
+ if ! [ -f $INCDIR/$INC ]; then
+ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1
+ fi
if [ -f $INCDIR/$INC ]; then
# detect major version of freetype2
FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`