Try to fix static bustage by porting parts of
bug 449292 to the comm-central build system
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -398,16 +398,18 @@ PNG_REQUIRES =
else
PNG_CFLAGS = @MOZ_PNG_CFLAGS@
PNG_LIBS = @MOZ_PNG_LIBS@
PNG_REQUIRES = png
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@
NSPR_CONFIG = @NSPR_CONFIG@
NSPR_CFLAGS = @NSPR_CFLAGS@
NSPR_LIBS = @NSPR_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -6844,16 +6844,23 @@ fi
AC_SUBST(MOZ_CAIRO_LIBS)
dnl qcms
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 ========================================================
MOZ_ARG_DISABLE_BOOL(xul,
[ --disable-xul Disable XUL],
MOZ_XUL= )
if test "$MOZ_XUL"; then
AC_DEFINE(MOZ_XUL)
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -186,16 +186,18 @@ EXTRA_DSO_LIBS += $(STATIC_EXTRA_DSO_LIB
REQUIRES += $(STATIC_REQUIRES)
EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
# OpenGL is required by (mozilla/)content/canvas: see (mozilla/)layout/build/Makefile.in.
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework OpenGL
endif
+LIBS += $(MOZ_HARFBUZZ_LIBS)
+
endif # BUILD_STATIC_LIBS
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
RCINCLUDE = splash.rc
ifndef GNU_CC
RCFLAGS += -DMOZ_THUNDERBIRD -I$(srcdir)
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -166,16 +166,19 @@ include $(topsrcdir)/config/static-confi
EXTRA_DEPS += \
$(STATIC_EXTRA_DEPS) \
$(NULL)
DEFINES += $(STATIC_DEFINES)
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.
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
OS_LIBS += -framework OpenGL
endif
ifeq ($(OS_ARCH),WINNT)