b=390048, fix bustage, patch by <bugzilla@mcsmurf.de> r=benjamin
authormasayuki@d-toybox.com
Wed, 15 Aug 2007 15:59:36 -0700
changeset 4695 89f69c3ee44fb7d52af11d048d5e321a8cb227b3
parent 4694 7084e603d639a97b13e6c3af125864a55468e5bd
child 4696 69c3364243030555fea43009c78fbaa887bc9cf3
push idunknown
push userunknown
push dateunknown
reviewersbenjamin
bugs390048
milestone1.9a8pre
b=390048, fix bustage, patch by <bugzilla@mcsmurf.de> r=benjamin
intl/build/Makefile.in
intl/lwbrk/src/Makefile.in
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -111,8 +111,11 @@ CXXFLAGS	+= \
 		$(MOZ_PANGO_CFLAGS) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_PANGO_LIBS) \
 		$(NULL)
 endif
 
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+OS_LIBS += $(call EXPAND_LIBNAME,usp10)
+endif
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -87,16 +87,9 @@ include $(topsrcdir)/config/rules.mk
 ifdef MOZ_ENABLE_PANGO
 CXXFLAGS	+= \
 		$(MOZ_PANGO_CFLAGS) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_PANGO_LIBS) \
 		$(NULL)
-
-else
-ifeq  ($(MOZ_WIDGET_TOOLKIT),windows)
-EXTRA_DSO_LDOPTS += \
-		usp10.lib \
-		$(NULL)
 endif
-endif