From 1b7909ef04436cfa2126570691831f9d136aa764 Mon Sep 17 00:00:00 2001
From: Mark Banner <bugzilla@standard8.plus.com>
Date: Sat, 12 Jun 2010 10:44:58 +0100
Subject: [PATCH] Try to fix static bustage by porting parts of bug 449292 to
 the comm-central build system

---
 config/autoconf.mk.in | 2 ++
 configure.in          | 7 +++++++
 mail/app/Makefile.in  | 2 ++
 suite/app/Makefile.in | 3 +++
 4 files changed, 14 insertions(+)

diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 3e0b4191bb..e990c47874 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -403,6 +403,8 @@ endif
 
 QCMS_LIBS	= @QCMS_LIBS@
 
+MOZ_HARFBUZZ_LIBS = @MOZ_HARFBUZZ_LIBS@
+
 MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
 SQLITE_CFLAGS     = @SQLITE_CFLAGS@
 SQLITE_LIBS       = @SQLITE_LIBS@
diff --git a/configure.in b/configure.in
index e81f832be6..15f135a0ca 100644
--- a/configure.in
+++ b/configure.in
@@ -6849,6 +6849,13 @@ dnl ========================================================
 QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'    
 AC_SUBST(QCMS_LIBS)
 
+
+dnl ========================================================
+dnl HarfBuzz
+dnl ========================================================
+MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
+AC_SUBST(MOZ_HARFBUZZ_LIBS)
+
 dnl ========================================================
 dnl disable xul
 dnl ========================================================
diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
index f640a87071..340ab69637 100644
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -191,6 +191,8 @@ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 OS_LIBS += -framework OpenGL
 endif
 
+LIBS += $(MOZ_HARFBUZZ_LIBS)
+
 endif # BUILD_STATIC_LIBS
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
index b314161ca9..0ce6e6f291 100644
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -171,6 +171,9 @@ CPPSRCS		+= $(STATIC_CPPSRCS)
 EXTRA_DSO_LIBS	+= $(STATIC_EXTRA_DSO_LIBS)
 REQUIRES	+= $(STATIC_REQUIRES)
 EXTRA_LIBS	+= $(STATIC_EXTRA_LIBS)
+
+LIBS += $(MOZ_HARFBUZZ_LIBS)
+
 endif
 
 # OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.