Index: abi/src/af/util/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/Makefile,v
retrieving revision 1.89
diff -u -r1.89 Makefile
--- abi/src/af/util/Makefile	23 Feb 2004 19:31:40 -0000	1.89
+++ abi/src/af/util/Makefile	23 Aug 2004 23:00:35 -0000
@@ -134,7 +134,7 @@
 ifeq ($(ABI_OPT_PEER_EXPAT),1)
  OBJS += $(OBJDIR)/ut_xml_expat.$(OBJ_SUFFIX)
 else
-	ifeq ($(OS_NAME),WIN32)
+	ifeq ($(ABI_OPT_MSXML),1)
 		OBJS += $(OBJDIR)/ut_xml_msxml.$(OBJ_SUFFIX)
 	else
 		OBJS += $(OBJDIR)/ut_xml_libxml2.$(OBJ_SUFFIX)
Index: abi/src/af/util/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- abi/src/af/util/win/Makefile	31 Jan 2004 13:24:29 -0000	1.23
+++ abi/src/af/util/win/Makefile	23 Aug 2004 23:00:35 -0000
@@ -35,7 +35,7 @@
 			ut_Win32Misc.cpp
 
 
-ifneq ($(ABI_OPT_PEER_EXPAT),1)
+ifeq ($(ABI_OPT_MSXML),1)
 	CPPSRCS += ut_xml_msxml.cpp
 endif
 
Index: abi/src/af/util/xp/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/Makefile,v
retrieving revision 1.85
diff -u -r1.85 Makefile
--- abi/src/af/util/xp/Makefile	13 Jun 2004 08:05:56 -0000	1.85
+++ abi/src/af/util/xp/Makefile	23 Aug 2004 23:00:36 -0000
@@ -71,7 +71,7 @@
 ifeq ($(ABI_OPT_PEER_EXPAT),1)
  CPPSRCS += ut_xml_expat.cpp
 else
-	ifneq ($(ABI_NATIVE),win)
+	ifneq ($(ABI_OPT_MSXML),1)
 		CPPSRCS += ut_xml_libxml2.cpp
 	endif
 endif
Index: abi/src/config/abi_defs.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs.mk,v
retrieving revision 1.253
diff -u -r1.253 abi_defs.mk
--- abi/src/config/abi_defs.mk	18 Jul 2004 02:25:03 -0000	1.253
+++ abi/src/config/abi_defs.mk	23 Aug 2004 23:00:38 -0000
@@ -52,12 +52,23 @@
 #### this variable as an environment variable.  A full recompile
 #### must be done when switching the value of this variable.
 ####
-#### NOTE: the Makefiles use 'ifdef' rather than 'ifeq' so setting
-#### NOTE: this to **any** value will enable it.
-####
 #### ABI_OPT_PEER_EXPAT=1
 ####
 
+#### To use the MSXML parser over the default
+#### build with libxml2 (aka gnome-xml version 2)
+#### add the following like back to the
+#### Makefile, add the variable to the make command line, or set
+#### this variable as an environment variable.  A full recompile
+#### must be done when switching the value of this variable.
+####
+#### NOTE: the MSXML parser is experimental and probably doesn't
+#### NOTE: work.  just maintaining compatibility for anyone who
+#### NOTE: still wants to test/develop it.
+####
+#### ABI_OPT_MSXML=1
+####
+
 #### To get a cygwin/gcc/gtk (as opposed to a native win32) build: add
 #### the following line back to the Makefile, add the variable to the
 #### make command line, or set this variable as an environment
@@ -596,19 +607,15 @@
   CFLAGS += -DHAVE_EXPAT
   ABI_OPTIONS+=XML:expat
 else
-  ifeq ($(OS_NAME),WIN32)
-	ABI_OPTIONS+=XML:msxml
-  else
-  ifeq ($(OS_NAME),MINGW32)
+  ifeq ($(ABI_OPT_MSXML),1)
 	ABI_OPTIONS+=XML:msxml
   else
-  XML_CFLAGS = $(shell $(LIBXML_CONFIG) --cflags)
-  XML_LIBS	 = $(shell $(LIBXML_CONFIG) --libs)
-  CFLAGS 	 +=	$(XML_CFLAGS)
-  EXTRA_LIBS +=	$(XML_LIBS)
-  ABI_OPTIONS+=XML:libxml2
-endif
-endif
+  	XML_CFLAGS = $(shell $(LIBXML_CONFIG) --cflags)
+  	XML_LIBS	 = $(shell $(LIBXML_CONFIG) --libs)
+  	CFLAGS 	 +=	$(XML_CFLAGS)
+  	EXTRA_LIBS +=	$(XML_LIBS)
+  	ABI_OPTIONS+=XML:libxml2
+  endif
 endif
 
 ifdef LIBGLADE_CONFIG
Index: abi/src/config/abi_rules.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_rules.mk,v
retrieving revision 1.45
diff -u -r1.45 abi_rules.mk
--- abi/src/config/abi_rules.mk	11 Aug 2004 21:27:28 -0000	1.45
+++ abi/src/config/abi_rules.mk	23 Aug 2004 23:00:38 -0000
@@ -52,6 +52,9 @@
 ifneq ($(ABI_OPT_LIBJPEG),1)
 ABI_OPT_LIBJPEG=0
 endif
+ifneq ($(ABI_OPT_MSXML),1)
+ABI_OPT_MSXML=0
+endif
 ifneq ($(ABI_OPT_PEER_EXPAT),1)
 ABI_OPT_PEER_EXPAT=0
 endif
Index: abi/src/config/platforms/mingw32.mk
===================================================================
RCS file: /cvsroot/abi/src/config/platforms/mingw32.mk,v
retrieving revision 1.24
diff -u -r1.24 mingw32.mk
--- abi/src/config/platforms/mingw32.mk	30 Jul 2004 22:12:55 -0000	1.24
+++ abi/src/config/platforms/mingw32.mk	23 Aug 2004 23:00:39 -0000
@@ -160,7 +160,7 @@
 OS_ENDIAN		= LittleEndian32
 endif
 
-# LIBXML_CONFIG	= xml2-config   # yeah, so, we don't use this yet.  may or may not before 2.0
+LIBXML_CONFIG	= pkg-config libxml-2.0   # yeah, so, we don't use this yet.  may or may not before 2.0
 
 # Which links can this platform create.  Define one not both of these options.
 UNIX_CAN_BUILD_DYNAMIC=0
@@ -171,6 +171,12 @@
 
 # Currently hard code expat to default for Win32
 ABI_OPT_PEER_EXPAT?=1
+ABI_OPT_MSXML?=0
+
+# If user wants MSXML, explicitly disable expat
+ifeq ($(ABI_OPT_MSXML),1)
+  ABI_OPT_PEER_EXPAT=0
+endif 
 
 # add wv's mini glib to include list
 ABI_OTH_INCS+=	/../../wv/glib-wv
Index: abi/src/wp/main/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/wp/main/win/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- abi/src/wp/main/win/Makefile	12 Jul 2004 18:55:57 -0000	1.63
+++ abi/src/wp/main/win/Makefile	23 Aug 2004 23:00:45 -0000
@@ -50,8 +50,13 @@
 #			Abi_libpopt $(ABIICONV) Abi_libpng Abi_zlib
 LoadOrder=	AbiGr AbiFmt AbiXAp AbiWPAp AbiPTbl AbiImpExp \
 			AbiEv AbiUtil AbiGr AbiWordVer AbiSpell 
-ABI_PERIPHLIBS=		Abi_libwv fribidi Abi_libexpat \
+ABI_PERIPHLIBS=		Abi_libwv fribidi \
 			Abi_libpopt $(ABIICONV) Abi_libpng
+
+ifeq ($(ABI_OPT_PEER_EXPAT), 1)
+ABI_PERIPHLIBS+=	Abi_libexpat
+endif
+
 ABI_APPLIBS=		$(LoadOrder) $(LoadOrder) $(LoadOrder) $(ABI_PERIPHLIBS)
 ABI_APPLIBDEP=		$(LoadOrder)