--- mozilla/mozilla/db/sqlite3/src/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/sqlite3/src/Makefile.in	2009-02-24 16:03:37 +0300
@@ -37,9 +37,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/db/morkreader/external/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/morkreader/external/Makefile.in	2009-02-24 16:03:37 +0300
@@ -36,9 +36,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../..
+DEPTH = @top_srcdir@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
--- mozilla/mozilla/db/morkreader/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/morkreader/Makefile.in	2009-02-24 16:03:37 +0300
@@ -35,9 +35,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../..
+DEPTH = @top_srcdir@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
--- mozilla/mozilla/db/mdb/public/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/mdb/public/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/db/mdb/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/mdb/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/db/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/db/mork/build/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/mork/build/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
--- mozilla/mozilla/db/mork/src/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/mork/src/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/db/mork/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/db/mork/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/xpfe/components/autocomplete/public/nsIAutoCompleteResults.idl.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/public/nsIAutoCompleteResults.idl	2009-02-24 16:03:37 +0300
@@ -58,9 +58,9 @@ interface nsIAutoCompleteItem : nsISuppo
     /**
      * class name used to define some style through
      * css like the colors, an icon url, etc...
      */
-    attribute string className;
+    attribute AString className;
     
     /**
      * parameter use by the search engine
      */
--- mozilla/mozilla/xpfe/components/autocomplete/public/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/public/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/xpfe/components/autocomplete/test/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/test/Makefile.in	2009-02-24 16:03:37 +0300
@@ -35,9 +35,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp	2009-02-24 16:03:37 +0300
@@ -38,9 +38,9 @@
 
 #include "nsCOMPtr.h"
 #include "prtypes.h"
 #include "nsAutoComplete.h"
-#include "nsReadableUtils.h"
+#include "nsComponentManagerUtils.h"
 #include "nsIGenericFactory.h"
 
 /******************************************************************************
  * nsAutoCompleteItem
@@ -80,17 +80,16 @@ NS_IMETHODIMP nsAutoCompleteItem::SetCom
     return NS_OK;
 }
 
 /* attribute string className; */
-NS_IMETHODIMP nsAutoCompleteItem::GetClassName(char * *aClassName)
+NS_IMETHODIMP nsAutoCompleteItem::GetClassName(nsAString& aClassName)
 {
-    if (!aClassName) return NS_ERROR_NULL_POINTER;
-    *aClassName = ToNewCString(mClassName);
+    aClassName.Assign(mClassName);
     return NS_OK;
 }
-NS_IMETHODIMP nsAutoCompleteItem::SetClassName(const char * aClassName)
+NS_IMETHODIMP nsAutoCompleteItem::SetClassName(const nsAString& aClassName)
 {
-    mClassName.AssignWithConversion(aClassName);
+    mClassName.Assign(aClassName);
     return NS_OK;
 }
 
 /* attribute nsISupports param; */
@@ -115,9 +114,9 @@ NS_IMPL_ISUPPORTS1(nsAutoCompleteResults
 
 nsAutoCompleteResults::nsAutoCompleteResults() :
     mDefaultItemIndex(0)
 {
-    NS_NewISupportsArray(getter_AddRefs(mItems));
+    mItems = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
 }
 
 nsAutoCompleteResults::~nsAutoCompleteResults()
 {
--- mozilla/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h	2009-02-24 16:03:37 +0300
@@ -39,9 +39,9 @@
 #ifndef nsAutoComplete_h___
 #define nsAutoComplete_h___
 
 #include "nsCOMPtr.h"
-#include "nsString.h"
+#include "nsStringAPI.h"
 #include "nsIDOMHTMLInputElement.h"
 #include "nsIAutoCompleteListener.h"
 #include "nsIAutoCompleteResults.h"
 
--- mozilla/mozilla/xpfe/components/autocomplete/src/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/src/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
@@ -45,9 +45,8 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= appcomps
 MODULE_NAME	= xpAutoComplete
 LIBRARY_NAME	= xpautocomplete
 SHORT_LIBNAME	= xpautoc
-MOZILLA_INTERNAL_API = 1
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 
 REQUIRES	= xpcom \
@@ -56,10 +55,15 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 CPPSRCS		= nsAutoComplete.cpp
 
+ifdef LIBXUL_SDK
+EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_EXTERNAL_LIBS) $(XPCOM_GLUE_LDOPTS)
+else
+EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS)
+endif
+
 EXTRA_DSO_LDOPTS += \
-	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- mozilla/mozilla/xpfe/components/autocomplete/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mozilla/xpfe/components/autocomplete/Makefile.in	2009-02-24 16:03:37 +0300
@@ -34,9 +34,9 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../..
+DEPTH		= @top_srcdir@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
--- mozilla/config/config.mk.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/config/config.mk	2009-02-24 16:03:37 +0300
@@ -150,8 +150,9 @@ FINAL_LINK_LIBS = $(MOZDEPTH)/config/fin
 FINAL_LINK_COMPS = $(MOZDEPTH)/config/final-link-comps
 FINAL_LINK_COMP_NAMES = $(MOZDEPTH)/config/final-link-comp-names
 
 MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
+MOZ_UNICHARUTIL_EXTERNAL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX)
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
 
 ifdef MOZ_MEMORY
 ifneq ($(OS_ARCH),WINNT)
--- mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp	2009-02-24 16:03:37 +0300
@@ -144,9 +144,9 @@ nsAbLDAPAutoCompFormatter::Format(nsILDA
                        " item->SetComment() failed");
         }
     }
 
-    rv = item->SetClassName("remote-abook");
+    rv = item->SetClassName(NS_LITERAL_STRING("remote-abook"));
     if (NS_FAILED(rv)) {
         NS_WARNING("nsAbLDAPAutoCompleteFormatter::Format():"
                    " item->SetClassName() failed");
     }
@@ -342,9 +342,9 @@ nsAbLDAPAutoCompFormatter::FormatExcepti
 
     // this is a remote addressbook, set the class name so the autocomplete 
     // item can be styled to show this
     //
-    rv = item->SetClassName("remote-err");
+    rv = item->SetClassName(NS_LITERAL_STRING("remote-err"));
     if (NS_FAILED(rv)) {
         NS_WARNING("nsAbLDAPAutoCompleteFormatter::FormatException():"
                    " item->SetClassName() failed");
     }
--- mozilla/mailnews/addrbook/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mailnews/addrbook/Makefile.in	2009-02-24 16:04:19 +0300
@@ -42,9 +42,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PARALLEL_DIRS	= public src
+PARALLEL_DIRS	=
+
+ifneq (,$(MOZ_THUNDERBIRD)$(MOZ_SUITE)$(MOZ_SUNBIRD))
+PARALLEL_DIRS	+= \
+	$(MOZILLA_SRCDIR)/xpfe/components/autocomplete
+endif
+
+PARALLEL_DIRS	+= public src
 
 ifdef ENABLE_TESTS
 PARALLEL_DIRS += test
 endif
--- mozilla/mailnews/Makefile.in.fix27	2009-02-24 16:02:53 +0300
+++ mozilla/mailnews/Makefile.in	2009-02-24 16:03:37 +0300
@@ -43,9 +43,15 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
 
-PARALLEL_DIRS	= base/search/src db/msgdb db/gloda news local mime compose imap addrbook import extensions
+PARALLEL_DIRS	=
+
+ifneq (,$(MOZ_THUNDERBIRD)$(MOZ_SUITE)$(MOZ_SUNBIRD))
+PARALLEL_DIRS	+= $(MOZILLA_SRCDIR)/db
+endif
+
+PARALLEL_DIRS	+= base/search/src db/msgdb db/gloda news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
 PARALLEL_DIRS	+= mapi/mapiDLL mapi/mapihook