diff --git a/mozilla/configure.in b/mozilla/configure.in
index be9db3e1465..5206a9bc8b8 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -3438,7 +3438,7 @@ dnl ========================================================
 dnl Need cookie and wallet to build mozilla, this should
 dnl not be the case, 18352 has been filed.
 dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
-MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras help"
+MOZ_EXTENSIONS_DEFAULT="cookie wallet xml-rpc xmlextras help transformiix"
 MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm inspector access-builtin"
 
 MOZ_ARG_WITH_STRING(extensions,
diff --git a/mozilla/extensions/transformiix/Makefile.in b/mozilla/extensions/transformiix/Makefile.in
index 45682e16b3c..792f76ce526 100644
--- a/mozilla/extensions/transformiix/Makefile.in
+++ b/mozilla/extensions/transformiix/Makefile.in
@@ -26,10 +26,14 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS            = source
+#Disable Transformiix on OS/2 until bug 53518 is fixed.
+ifneq ($(OS_ARCH),OS2)
 
+DIRS            = source
 ifdef MOZ_XSL
 DIRS += build public
 endif
 
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index 22c06e29e0c..eee8201af04 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -125,6 +125,11 @@ OBJS =../source/base/ArrayList.o \
   ../source/xslt/util/NodeStack.o \
   XSLTProcessorModule.o
 
+EXTRA_DSO_LDOPTS += \
+  $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_JS_LIBS) \
+  $(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../source/xslt -I$(srcdir)/../source/base \
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
index 6641eee15a3..a720c61de4c 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
@@ -147,7 +147,7 @@ _txClass* Document::_function(nsIDOM##_txClass* aNsObject) \
  * This macro does a nullsafe getNSObj. If the wrapper object is NULL,
  * NULL is returned. Else getNSObj is used to get the inner object.
  */
-#define GET_NSOBJ(_txWrapper) ((_txWrapper) ? (_txWrapper)->getNSObj() : NULL)
+#define GET_NSOBJ(_txWrapper) ((_txWrapper) ? (_txWrapper)->getNSObj() : nsnull)
 
 /**
  * Base wrapper class for a Mozilla object. Owns the Mozilla object through an
diff --git a/mozilla/extensions/transformiix/source/xpath/Expr.h b/mozilla/extensions/transformiix/source/xpath/Expr.h
index 2da4544ef2b..7f288252a57 100644
--- a/mozilla/extensions/transformiix/source/xpath/Expr.h
+++ b/mozilla/extensions/transformiix/source/xpath/Expr.h
@@ -25,7 +25,7 @@
  *     - changed constant short declarations in many of the classes
  *       with enumerations, commented with //--LF
  *
- * $Id: Expr.h,v 1.12 2001-04-14 17:24:59 axel%pike.org Exp $
+ * $Id: Expr.h,v 1.13 2001-05-12 09:54:15 nisheeth%netscape.com Exp $
  */
 
 
@@ -46,7 +46,7 @@
 /*
   XPath class definitions.
   Much of this code was ported from XSL:P.
-  @version $Revision: 1.12 $ $Date: 2001-04-14 17:24:59 $
+  @version $Revision: 1.13 $ $Date: 2001-05-12 09:54:15 $
 */
 
 //necessary prototypes
@@ -1048,6 +1048,7 @@ public:
     StringExpr();
     StringExpr(String& value);
     StringExpr(const String& value);
+    StringExpr(const char* value);
     ~StringExpr();
 
     /**
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprResult.h b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
index 6bac92cd957..f5f67aef231 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprResult.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprResult.h
@@ -23,7 +23,7 @@
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *   -- changed constant short result types to enum
  *
- * $Id: ExprResult.h,v 1.9 2001-04-08 14:34:27 peterv%netscape.com Exp $
+ * $Id: ExprResult.h,v 1.10 2001-05-12 09:54:15 nisheeth%netscape.com Exp $
  */
 
 #ifndef TRANSFRMX_EXPRRESULT_H
@@ -131,6 +131,7 @@ public:
     StringResult(String& str);
     StringResult(const String& str);
     StringResult(const StringResult& strResult);
+    StringResult(const char* str);
 
     String& getValue();
 
diff --git a/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp b/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp
index e0105ebbf2e..291ea705d06 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringExpr.cpp
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: StringExpr.cpp,v 1.1 2000-04-06 07:45:39 kvisco%ziplink.net Exp $
+ * $Id: StringExpr.cpp,v 1.2 2001-05-12 09:54:16 nisheeth%netscape.com Exp $
  */
 
 #include "Expr.h"
@@ -29,7 +29,7 @@
 /**
  * StringExpr
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.1 $ $Date: 2000-04-06 07:45:39 $
+ * @version $Revision: 1.2 $ $Date: 2001-05-12 09:54:16 $
 **/
 
 /**
@@ -47,6 +47,11 @@ StringExpr::StringExpr(const String& value) {
     this->value.append(value);
 } //-- StringExpr
 
+StringExpr::StringExpr(const char* value) {
+    //-- copy value
+    this->value.append(value);
+} //-- StringExpr
+
 /**
  * Default Destructor
 **/
diff --git a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
index cbdb0f39812..6ccf62e4eed 100644
--- a/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/StringResult.cpp
@@ -21,14 +21,14 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: StringResult.cpp,v 1.6 2001-01-22 09:36:19 kvisco%ziplink.net Exp $
+ * $Id: StringResult.cpp,v 1.7 2001-05-12 09:54:16 nisheeth%netscape.com Exp $
  */
 
 /**
  * StringResult
  * Represents a String as a Result of evaluating an Expr
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.6 $ $Date: 2001-01-22 09:36:19 $
+ * @version $Revision: 1.7 $ $Date: 2001-05-12 09:54:16 $
 **/
 #include "ExprResult.h"
 
@@ -57,6 +57,15 @@ StringResult::StringResult(const String& str) {
     this->value = str;
 } //-- StringResult
 
+/**
+ * Creates a new StringResult with the value of the given String parameter
+ * @param str the String to use for initialization of this StringResult's value
+**/
+StringResult::StringResult(const char* str) {
+    //-- copy str
+    this->value = str;
+} //-- StringResult
+
 /**
  * Returns the value of this StringResult
 **/