summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@behdad.org>2015-08-18 15:55:09 +0100
committerBehdad Esfahbod <behdad@behdad.org>2015-08-18 15:55:09 +0100
commitddd6bf12f1cabaa298feed820313483b9893528c (patch)
tree4d370cc1981170452b14d6e0d7d24eba303dde61
parent2c8b3b2e5312c9858584f568b1528c57e5bb8a10 (diff)
downloadharfbuzz-ddd6bf12f1cabaa298feed820313483b9893528c.tar.gz
Don't declare dependency on freetype in harfbuzz.pc
See comments.
-rw-r--r--src/Makefile.am7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 132683ab..856aae6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,7 +149,12 @@ endif
if HAVE_FREETYPE
HBCFLAGS += $(FREETYPE_CFLAGS)
HBLIBS += $(FREETYPE_LIBS)
-HBDEPS += $(FREETYPE_DEPS)
+# XXX
+# The following creates a recursive dependency on FreeType if FreeType is
+# built with HarfBuzz support enabled. Newer pkg-config handles that just
+# fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes. Remove
+# in a year or two, or otherwise work around it...
+#HBDEPS += $(FREETYPE_DEPS)
HBSOURCES += hb-ft.cc
HBHEADERS += hb-ft.h
endif