summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-13 03:07:09 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-13 03:07:58 +0100
commit1ee1ffbae69dc78721af139f0794628571fd35ef (patch)
treef0f1e771161ffb02fba5048f6d14a3e941096724
parent2e7cd6be55ca31d6874e8ea70c61ebf82d16556a (diff)
downloadqt3-1ee1ffbae69dc78721af139f0794628571fd35ef.tar.gz
qt3-1ee1ffbae69dc78721af139f0794628571fd35ef.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 5cabc32..d4cb4ba 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 }'`