putting these changes back since the problem was with configure

xpfe/components/build/Makefile.in

@@ -76,8 +76,10 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 REQUIRES += history downloadmanager
 endif
+endif
 
 CPPSRCS		= nsModule.cpp
 
@@ -99,6 +101,7 @@ SHARED_LIBRARY_LIBS = \
 	$(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 SHARED_LIBRARY_LIBS += \
 	$(DIST)/lib/$(LIB_PREFIX)autocomplete_s.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)bookmarks_s.$(LIB_SUFFIX) \
@@ -115,6 +118,7 @@ SHARED_LIBRARY_LIBS += \
 	$(NULL)
 endif
 
+endif
 endif
 
 LOCAL_INCLUDES	= \
@@ -125,6 +129,7 @@ LOCAL_INCLUDES	= \
 	$(NULL)
 
 ifndef MOZ_PHOENIX
+ifndef MOZ_XULRUNNER
 LOCAL_INCLUDES += \
   -I$(srcdir)/../autocomplete/src  \
   -I$(srcdir)/../bookmarks/src     \
@@ -141,6 +146,7 @@ LOCAL_INCLUDES += \
   $(NULL)
 endif
 
+endif
 endif
 
 ifeq ($(OS_ARCH),WINNT)