projects
/
platform
/
upstream
/
pango.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77bc5ff
)
Fix Xft detection
author
Behdad Esfahbod
<behdad@behdad.org>
Thu, 23 Aug 2012 14:59:03 +0000
(10:59 -0400)
committer
Behdad Esfahbod
<behdad@behdad.org>
Thu, 23 Aug 2012 14:59:03 +0000
(10:59 -0400)
configure.in
patch
|
blob
|
history
diff --git
a/configure.in
b/configure.in
index
bb2dfd0
..
444fb57
100644
(file)
--- a/
configure.in
+++ b/
configure.in
@@
-231,10
+231,6
@@
AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
have_harfbuzz=false
PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 0.9.3, have_harfbuzz=true, AC_MSG_RESULT([no]))
AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz)
-if ! $have_harfbuzz; then
- have_freetype=false
- have_xft=false
-fi
#
# Check for fontconfig
@@
-264,6
+260,7
@@
AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
#
# Checks for Xft/XRender
#
+have_xft=false
if $have_freetype ; then
PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no]))
fi