Bug 335421 - Make FF+XR work on windows, r=mento

Makefile.in

@@ -337,14 +337,16 @@ tier_99_dirs	+= extensions
 endif
 
 # axcontrol
+ifndef LIBXUL_SDK
 ifeq ($(OS_ARCH),WINNT)
 ifndef MOZ_NO_ACTIVEX_SUPPORT
 tier_99_dirs += \
 		embedding/browser/activex/src/control \
 		embedding/browser/activex/src/control_kicker \
 		$(NULL)
-endif
+endif # MOZ_NO_ACTIVEX_SUPPORT
-endif
+endif # WINNT
+endif # LIBXUL_SDK
 
 # Java Embedding Plugin
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
@@ -410,6 +412,8 @@ endif
 endif
 endif
 
+ifndef LIBXUL_SDK
+
 # winembed, mfcembed
 ifeq ($(OS_ARCH),WINNT)
 ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
@@ -424,6 +428,8 @@ tier_99_dirs += embedding/tests
 endif
 endif
 
+endif # LIBXUL_SDK
+
 ifeq ($(MOZ_BUILD_APP),macbrowser)
 tier_99_dirs += \
 	embedding/config \

browser/components/build/Makefile.in

@@ -103,8 +103,12 @@ EXTRA_DSO_LDOPTS += \
 	$(NULL)
 
 ifdef MOZ_PLACES
+ifdef MOZ_ENABLE_LIBXUL
+EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/../db/morkreader/external/$(LIB_PREFIX)morkreader_external_s.$(LIB_SUFFIX)
+else
 EXTRA_DSO_LDOPTS += $(LIBXUL_DIST)/../db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
 endif
+endif
 
 # Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
 # GTK2: Need to link with glib for GNOME shell service

db/morkreader/Makefile.in

@@ -43,6 +43,10 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_ENABLE_LIBXUL
+DIRS = external
+endif
+
 MODULE = morkreader
 LIBRARY_NAME  = morkreader_s
 LIBXUL_LIBRARY = 1

db/morkreader/external/Makefile.in

@@ -0,0 +1,61 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Places code
+#
+# The Initial Developer of the Original Code is
+# Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2006
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Brian Ryner <bryner@brianryner.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = morkreader
+LIBRARY_NAME  = morkreader_external_s
+MOZILLA_INTERNAL_API = 1
+FORCE_STATIC_LIB = 1
+
+REQUIRES = xpcom \
+           string \
+           necko \
+           $(NULL)
+
+CPPSRCS = nsMorkReader.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+nsMorkReader.cpp: $(srcdir)/../nsMorkReader.cpp
+	$(INSTALL) $^ .