diff options
Diffstat (limited to 'config.tests')
| -rwxr-xr-x | config.tests/x11/xfreetype.test | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test index d4cb4ba17..dbe610649 100755 --- a/config.tests/x11/xfreetype.test +++ b/config.tests/x11/xfreetype.test @@ -1,7 +1,6 @@ #!/bin/sh XFT=yes -XFT2=no XFT2_HEADER=no XCONFIG=$1/qmake.conf VERBOSE=$2 @@ -88,29 +87,7 @@ if [ "$XFT" = "yes" ]; then XFT_MINOR=`grep XFT_MINOR $XFT_H | head -n 1 | awk '{ print \$3 }'` XFT_REVISION=`grep XFT_REVISION $XFT_H | head -n 1 | awk '{ print \$3 }'` [ "$VERBOSE" = "yes" ] && echo " Found Xft version $XFT_MAJOR.$XFT_MINOR.$XFT_REVISION" - if [ "$XFT_MAJOR" = "2" ]; then - XFT2=yes LIBXFT="$LIBXFT -lfontconfig" - fi -fi - -# find XftFreetype.h if using Xft1 -if [ "$XFT" = "yes" ] && [ "$XFT2" = "no" ]; then - INC="X11/Xft/XftFreetype.h" - XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` - INCDIRS="$IN_INCDIRS $XDIRS /usr/include /include" - F= - for INCDIR in $INCDIRS; do - if [ -f $INCDIR/$INC ]; then - F=yes - [ "$VERBOSE" = "yes" ] && echo " Found $INC in $INCDIR" - break - fi - done - if [ -z "$F" ]; then - XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" - fi fi # check for freetype2 headers @@ -150,7 +127,7 @@ if [ "$XFT" = "yes" ]; then fi # check for fontconfig headers when using Xft2 -if [ "$XFT" = "yes" ] && [ "$XFT2" = "yes" ]; then +if [ "$XFT" = "yes" ]; then INC="fontconfig/fontconfig.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` |