Rename our in-tree expat lib to mozexpat_s. Bug 305841, patch by Andy Willis

<abwillis1@gmail.com>, r=peterv

content/xslt/src/main/Makefile.in

@@ -62,7 +62,7 @@ TX_LIBS = \
 	txxpath_s \
 	txxml_s \
 	txbase_s \
-	expat_s \
+	mozexpat_s \
 	$(NULL)
 
 LIBS = \

modules/staticmod/meta.mak

@@ -77,7 +77,7 @@ LLIBS           = $(LLIBS)                      \
                   $(DIST)\lib\png.lib           \
                   $(DIST)\lib\mng.lib           \
                   $(DIST)\lib\util.lib          \
-                  $(DIST)\lib\expat.lib         \
+                  $(DIST)\lib\mozexpat.lib         \
                   $(DIST)\lib\nsldap32v40.lib
 
 WIN_LIBS        = $(WIN_LIBS)   \

parser/expat/lib/Makefile.in

@@ -43,7 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= expat
-LIBRARY_NAME	= expat_s
+LIBRARY_NAME	= mozexpat_s
 
 CSRCS		= \
 		xmlparse.c \

parser/htmlparser/src/Makefile.in

@@ -68,7 +68,7 @@ REQUIRES	= xpcom \
 		  $(NULL)
 
 SHARED_LIBRARY_LIBS = \
-		$(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/$(LIB_PREFIX)mozexpat_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS