summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-11-07 00:26:43 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-11-07 00:27:03 +0100
commite7fee7d4a5add0aa3547221953ad2e155c28ad15 (patch)
treeba47aa05edf49842769e53891dafe70ac911dd51
parent0f063b37863759c3c843cff94fdb166efeb3bed2 (diff)
add dependency on fontconfig to cairo
Change-Id: I7c97169ea56c8290d0866e2e226cd4ecf4debc25
-rw-r--r--Module_tail_build.mk2
-rw-r--r--cairo/prj/build.lst2
2 files changed, 1 insertions, 3 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 142f828025e3..f70f6c4e7648 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -71,12 +71,10 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
extras \
fileaccess \
filter \
- $(call gb_Helper_optional,FONTCONFIG,fontconfig) \
forms \
formula \
fpicker \
framework \
- $(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index b10763514f47..9e8db83da055 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo cairo : ZLIB:zlib LIBPNG:libpng soltools NULL
+lcairo cairo : FONTCONFIG:fontconfig ZLIB:zlib LIBPNG:libpng soltools NULL
lcairo cairo usr1 - all lcairo_mkout NULL
lcairo cairo\pixman nmake - all lcairo_pixman NULL
lcairo cairo\cairo nmake - all lcairo_cairo lcairo_pixman NULL