bug 450781 - make xpfe autocomplete build with |--enable-libxul| and build it from build.mk, r=Callek, a=NPOTB for Firefox
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 31 Aug 2008 16:11:19 +0200
changeset 50899 dc81ebe616eeb311c2a760dde7e601b910422824
parent 50898 5daf8744eed1d8da2f31a836c8a54cc5af3dc6c1
child 50900 a7874c76431f4c504363ffbf860e45e1c450d2da
push idunknown
push userunknown
push dateunknown
reviewersCallek, NPOTB
bugs450781
milestone2.0b5pre
bug 450781 - make xpfe autocomplete build with |--enable-libxul| and build it from build.mk, r=Callek, a=NPOTB for Firefox
xpfe/components/Makefile.in
xpfe/components/autocomplete/src/Makefile.in
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -47,19 +47,15 @@ MODULE = appcomps
 include $(topsrcdir)/config/config.mk
 
 ifdef MOZ_RDF
 DIRS += \
         windowds \
         $(NULL)
 endif
 
-ifneq (,$(MOZ_THUNDERBIRD)$(MOZ_SUITE)$(MOZ_SUNBIRD))
-DIRS += autocomplete
-endif
-
 # build should be last
 DIRS += \
         directory \
         build \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@@ -41,21 +41,20 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= appcomps
 MODULE_NAME	= xpAutoComplete
 LIBRARY_NAME	= xpautocomplete
 SHORT_LIBNAME	= xpautoc
-MOZILLA_INTERNAL_API = 1
+MOZILLA_INTERNAL_API = $(BUILD_STATIC_LIBS)
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 
-
 CPPSRCS		= nsAutoComplete.cpp
 
 EXTRA_DSO_LDOPTS += \
-	$(MOZ_UNICHARUTIL_LIBS) \
+	$(XPCOM_GLUE_LDOPTS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk