Index: abi/src/af/util/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/Makefile,v
retrieving revision 1.89
diff -r1.89 Makefile
137c137
< 	ifeq ($(OS_NAME),WIN32)
---
> 	ifeq ($(ABI_OPT_MSXML),1)
Index: abi/src/af/util/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/win/Makefile,v
retrieving revision 1.23
diff -r1.23 Makefile
38c38
< ifneq ($(ABI_OPT_PEER_EXPAT),1)
---
> ifeq ($(ABI_OPT_MSXML),1)
Index: abi/src/af/util/xp/Makefile
===================================================================
RCS file: /cvsroot/abi/src/af/util/xp/Makefile,v
retrieving revision 1.85
diff -r1.85 Makefile
74c74
< 	ifneq ($(ABI_NATIVE),win)
---
> 	ifneq ($(ABI_OPT_MSXML),1)
Index: abi/src/config/abi_defs.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs.mk,v
retrieving revision 1.253
diff -r1.253 abi_defs.mk
55,57d54
< #### NOTE: the Makefiles use 'ifdef' rather than 'ifeq' so setting
< #### NOTE: this to **any** value will enable it.
< ####
60a58,71
> #### 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
> ####
> 
599,602c610
<   ifeq ($(OS_NAME),WIN32)
< 	ABI_OPTIONS+=XML:msxml
<   else
<   ifeq ($(OS_NAME),MINGW32)
---
>   ifeq ($(ABI_OPT_MSXML),1)
605,611c613,618
<   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
Index: abi/src/config/abi_rules.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_rules.mk,v
retrieving revision 1.45
diff -r1.45 abi_rules.mk
54a55,57
> ifneq ($(ABI_OPT_MSXML),1)
> ABI_OPT_MSXML=0
> endif
Index: abi/src/config/platforms/mingw32.mk
===================================================================
RCS file: /cvsroot/abi/src/config/platforms/mingw32.mk,v
retrieving revision 1.24
diff -r1.24 mingw32.mk
163c163
< # 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
173a174,179
> ABI_OPT_MSXML?=0
> 
> # If user wants MSXML, explicitly disable expat
> ifeq ($(ABI_OPT_MSXML),1)
>   ABI_OPT_PEER_EXPAT=0
> endif 
Index: abi/src/wp/main/win/Makefile
===================================================================
RCS file: /cvsroot/abi/src/wp/main/win/Makefile,v
retrieving revision 1.63
diff -r1.63 Makefile
53c53
< ABI_PERIPHLIBS=		Abi_libwv fribidi Abi_libexpat \
---
> ABI_PERIPHLIBS=		Abi_libwv fribidi \
54a55,59
> 
> ifeq ($(ABI_OPT_PEER_EXPAT), 1)
> ABI_PERIPHLIBS+=	Abi_libexpat
> endif
>