]> git.saurik.com Git - wxWidgets.git/commitdiff
moved XML classes to the core
authorVáclav Slavík <vslavik@fastmail.fm>
Sun, 20 Jul 2003 21:50:39 +0000 (21:50 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Sun, 20 Jul 2003 21:50:39 +0000 (21:50 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in
autoconf_inc.m4
configure
configure.in
setup.h.in

index ad6584feddde46515beb7d1a4cac1e3d50b043b7..6c157ff6932052d2b83b52d24559c67807829e4d 100644 (file)
@@ -21,6 +21,7 @@ DLLPREFIX = @DLLPREFIX@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
+EXTRALIBS_XML = @EXTRALIBS_XML@
 HOST_SUFFIX = @HOST_SUFFIX@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_DIR = @INSTALL_DIR@
@@ -107,12 +108,20 @@ MONOLIB_CFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 MONOLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
        -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
        $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DwxUSE_BASE=1 $(CXXFLAGS)
+WXEXPAT_CFLAGS = $(CPPFLAGS)   -I./src/expat $(CFLAGS)
 WXJPEG_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXODBC_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXPNG_CFLAGS = $(CPPFLAGS)   $(__INC_ZLIB_p) $(CFLAGS)
 WXREGEX_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXTIFF_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
+XMLDLL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) -DWXUSINGDLL \
+       -DWXMAKINGDLL_XML $(CXXFLAGS) $(PIC_FLAG)
+XMLLIB_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+       -I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
+       $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 
@@ -1704,6 +1713,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
 @COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
 @COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
+@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
+@COND_WXUSE_EXPAT_BUILTIN@     -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   -lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
@@ -2191,12 +2202,15 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_0_SHARED_0_USE_HTML_1@        = install_htmllib
 @COND_MONOLITHIC_1_SHARED_1@__install_monodll___depname = install_monodll
 @COND_MONOLITHIC_1_SHARED_0@__install_monolib___depname = install_monolib
+@COND_WXUSE_EXPAT_BUILTIN@__install_wxexpat___depname = install_wxexpat
 @COND_WXUSE_LIBJPEG_BUILTIN@__install_wxjpeg___depname = install_wxjpeg
 @COND_WXUSE_ODBC_BUILTIN@__install_wxodbc___depname = install_wxodbc
 @COND_WXUSE_LIBPNG_BUILTIN@__install_wxpng___depname = install_wxpng
 @COND_WXUSE_REGEX_BUILTIN@__install_wxregex___depname = install_wxregex
 @COND_WXUSE_LIBTIFF_BUILTIN@__install_wxtiff___depname = install_wxtiff
 @COND_WXUSE_ZLIB_BUILTIN@__install_wxzlib___depname = install_wxzlib
+@COND_MONOLITHIC_0_SHARED_1@__install_xmldll___depname = install_xmldll
+@COND_MONOLITHIC_0_SHARED_0@__install_xmllib___depname = install_xmllib
 @COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).0.r
 @COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
 @COND_MONOLITHIC_1_SHARED_1@__monodll___depname \
@@ -2235,6 +2249,8 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_MONOLITHIC_1_SHARED_0@__monolib___depname \
 @COND_MONOLITHIC_1_SHARED_0@   = \
 @COND_MONOLITHIC_1_SHARED_0@   $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a
+@COND_WXUSE_EXPAT_BUILTIN@__wxexpat___depname = \
+@COND_WXUSE_EXPAT_BUILTIN@     $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_LIBJPEG_BUILTIN@__wxjpeg___depname \
 @COND_WXUSE_LIBJPEG_BUILTIN@   = \
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a
@@ -2249,6 +2265,41 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 @COND_WXUSE_LIBTIFF_BUILTIN@   $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
 @COND_WXUSE_ZLIB_BUILTIN@__wxzlib___depname = \
 @COND_WXUSE_ZLIB_BUILTIN@      $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a
+@COND_MONOLITHIC_0_SHARED_1@__xmldll___depname \
+@COND_MONOLITHIC_0_SHARED_1@   = \
+@COND_MONOLITHIC_0_SHARED_1@   $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_PLATFORM_WIN32_1@__xmldll___importlib = \
+@COND_PLATFORM_WIN32_1@        -Wl,--out-implib,$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_PLATFORM_MACOSX_1@__xmldll___macinstnamecmd = \
+@COND_PLATFORM_MACOSX_1@       -install_name \
+@COND_PLATFORM_MACOSX_1@       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_cmd = \
+@COND_USE_SOSYMLINKS_1@        rm -f \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@        $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOSYMLINKS_1@__xmldll___so_symlinks_inst_cmd \
+@COND_USE_SOSYMLINKS_1@        = rm -f \
+@COND_USE_SOSYMLINKS_1@        libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+@COND_USE_SOSYMLINKS_1@        $(LN_S) \
+@COND_USE_SOSYMLINKS_1@        $(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+@COND_USE_SOSYMLINKS_1@        libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_USE_SOVERLINUX_1@__xmldll___soname_flags = \
+@COND_USE_SOVERLINUX_1@        $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERSOLARIS_1@__xmldll___soname_flags = \
+@COND_USE_SOVERSOLARIS_1@      $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_0@__xmllib___depname \
+@COND_MONOLITHIC_0_SHARED_0@   = \
+@COND_MONOLITHIC_0_SHARED_0@   $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a
 @COND_PLATFORM_MACOSX_1@dll___macver = \
 @COND_PLATFORM_MACOSX_1@       -compatibility_version 2.5 -current_version 2.5.0
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).0
@@ -2262,10 +2313,10 @@ WXZLIB_CFLAGS = $(CPPFLAGS)   $(CFLAGS)
 
 ### Targets: ###
 
-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname)
+all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__coredll___depname) $(__corelib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__gldll___depname) $(__gllib___depname) $(__macos_res___depname)
 
 @COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxzlib___depname) $(__wxregex___depname) basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2)
-@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  basedll_appbase.o basedll_clntdata.o basedll_cmdline.o basedll_config.o basedll_datetime.o basedll_datstrm.o basedll_db.o basedll_dbtable.o basedll_dircmn.o basedll_dynarray.o basedll_dynlib.o basedll_dynload.o basedll_encconv.o basedll_extended.o basedll_ffile.o basedll_file.o basedll_fileconf.o basedll_filefn.o basedll_filename.o basedll_filesys.o basedll_fmapbase.o basedll_fs_inet.o basedll_fs_zip.o basedll_ftp.o basedll_hash.o basedll_hashmap.o basedll_http.o basedll_init.o basedll_intl.o basedll_ipcbase.o basedll_list.o basedll_log.o basedll_longlong.o basedll_memory.o basedll_mimecmn.o basedll_module.o basedll_mstream.o basedll_object.o basedll_process.o basedll_protocol.o basedll_regex.o basedll_sckaddr.o basedll_sckfile.o basedll_sckipc.o basedll_sckstrm.o basedll_socket.o basedll_stopwatch.o basedll_strconv.o basedll_stream.o basedll_string.o basedll_sysopt.o basedll_textbuf.o basedll_textfile.o basedll_tokenzr.o basedll_txtstrm.o basedll_unzip.o basedll_url.o basedll_variant.o basedll_wfstream.o basedll_wxchar.o basedll_zipstrm.o basedll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_2) basedll_event.o basedll_fs_mem.o basedll_msgout.o basedll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__basedll___macinstnamecmd) $(__basedll___importlib) $(__basedll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS)
 @COND_MONOLITHIC_0_SHARED_1@   $(__basedll___so_symlinks_cmd)
 
 basedll_appbase.o: $(srcdir)/src/common/appbase.cpp
@@ -2930,6 +2981,7 @@ clean:
        rm -f $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/libwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX).a
+       rm -f $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
@@ -2946,14 +2998,18 @@ clean:
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX).a
+       rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+       rm -f $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a
        rm -f $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
        rm -f $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl-2.5$(HOST_SUFFIX).a
        rm -f lib/libwx_$(TOOLCHAIN_NAME).0.rsrc lib/libwx_$(TOOLCHAIN_NAME).0.r
 
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@  coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(SHARED_LD_CXX) $@  coredll_event.o coredll_fs_mem.o coredll_msgout.o coredll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_4) $(__CORE_SRC_OBJECTS_2) $(LDFLAGS)   -L$(top_builddir)lib $(__coredll___macinstnamecmd) $(__coredll___importlib) $(__coredll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ $(__coredll___so_symlinks_cmd)
 
 coredll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
@@ -7231,8 +7287,8 @@ distclean: clean
        rm -f configure config.cache config.log config.status
        rm -f bk-deps shared-ld-sh
 
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__OPENGL_SRC_OBJECTS)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@  $(__OPENGL_SRC_OBJECTS) $(LDFLAGS)   -L$(top_builddir)lib $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__OPENGL_SRC_OBJECTS)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(SHARED_LD_CXX) $@  $(__OPENGL_SRC_OBJECTS) $(LDFLAGS)   -L$(top_builddir)lib $(__gldll___macinstnamecmd) $(__gldll___importlib) $(__gldll___soname_flags) $(dll___macver) $(EXTRALIBS_OPENGL)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p)
 @COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ $(__gldll___so_symlinks_cmd)
 
 @COND_TOOLKIT_X11@gldll_glcanvas.o: $(srcdir)/src/x11/glcanvas.cpp
@@ -7270,8 +7326,8 @@ distclean: clean
 @COND_TOOLKIT_MSW@gllib_glcanvas.o: $(srcdir)/src/msw/glcanvas.cpp
 @COND_TOOLKIT_MSW@     $(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(__coredll___depname) $(__basedll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@  $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(LDFLAGS)   -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(__coredll___depname) $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(SHARED_LD_CXX) $@  $(__HTML_SRC_PLATFORM_OBJECTS_2) htmldll_helpdata.o htmldll_helpfrm.o htmldll_helpctrl.o htmldll_htmlcell.o htmldll_htmlfilt.o htmldll_htmlpars.o htmldll_htmltag.o htmldll_htmlwin.o htmldll_winpars.o htmldll_m_fonts.o htmldll_m_hline.o htmldll_m_image.o htmldll_m_layout.o htmldll_m_links.o htmldll_m_list.o htmldll_m_dflist.o htmldll_m_pre.o htmldll_m_tables.o htmldll_m_style.o htmldll_htmprint.o htmldll_htmllbox.o $(LDFLAGS)   -L$(top_builddir)lib $(__htmldll___macinstnamecmd) $(__htmldll___importlib) $(__htmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT)
 @COND_MONOLITHIC_0_SHARED_1_USE_HTML_1@        $(__htmldll___so_symlinks_cmd)
 
 htmldll_helpbest.o: $(srcdir)/src/msw/helpbest.cpp
@@ -7411,13 +7467,13 @@ htmllib_m_tables.o: $(srcdir)/src/html/m_tables.cpp
 htmllib_winpars.o: $(srcdir)/src/html/winpars.cpp
        $(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $<
 
-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname)
+install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_afm___depname) $(__install_gsafm___depname) install-wxconfig $(__macos_res_install___depname)
        $(INSTALL_DIR) $(datadir)/aclocal
        (cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(datadir)/aclocal)
        $(INSTALL_DIR) $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx
        (cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_NAME)/wx/setup.h $(libdir)/wx/include/$(TOOLCHAIN_NAME)/wx)
        $(INSTALL_DIR) $(includedir)
-       for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h wx/protocol/protocol.h wx/protocol/http.h $(BASE_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h $(OPENGL_HDR); do \
+       for f in wx/apptrait.h wx/beforestd.h wx/containr.h wx/msgout.h wx/types.h wx/init.h wx/arrimpl.cpp wx/listimpl.cpp wx/app.h wx/buffer.h wx/build.h wx/chkconf.h wx/clntdata.h wx/cmdline.h wx/confbase.h wx/config.h wx/datetime.h wx/datetime.inl wx/datstrm.h wx/db.h wx/dbkeyg.h wx/dbtable.h wx/dde.h wx/debug.h wx/defs.h wx/dir.h wx/dynarray.h wx/arrstr.h wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h wx/features.h wx/ffile.h wx/file.h wx/fileconf.h wx/filefn.h wx/filename.h wx/filesys.h wx/fontenc.h wx/fontmap.h wx/fs_inet.h wx/fs_zip.h wx/fs_mem.h wx/gsocket.h wx/hash.h wx/hashmap.h wx/iconloc.h wx/intl.h wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h wx/isql.h wx/isqlext.h wx/list.h wx/log.h wx/longlong.h wx/math.h wx/memory.h wx/memconf.h wx/memtext.h wx/mimetype.h wx/module.h wx/msgout.h wx/mstream.h wx/object.h wx/platform.h wx/process.h wx/regex.h wx/sckaddr.h wx/sckipc.h wx/sckstrm.h wx/socket.h wx/snglinst.h wx/stopwatch.h wx/strconv.h wx/stream.h wx/string.h wx/sysopt.h wx/textbuf.h wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/tokenzr.h wx/txtstrm.h wx/url.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h wx/wfstream.h wx/wx.h wx/wxchar.h wx/wxprec.h wx/zipstrm.h wx/zstream.h wx/protocol/protocol.h wx/protocol/http.h $(BASE_PLATFORM_HDR) $(ALL_GUI_HEADERS) wx/wxhtml.h wx/html/forcelnk.h wx/html/helpctrl.h wx/html/helpdata.h wx/html/helpfrm.h wx/html/htmlcell.h wx/html/htmldefs.h wx/html/htmlfilt.h wx/html/htmlpars.h wx/html/htmlproc.h wx/html/htmltag.h wx/html/htmlwin.h wx/html/htmprint.h wx/html/m_templ.h wx/html/winpars.h wx/htmllbox.h wx/xml/xml.h $(OPENGL_HDR); do \
        if test ! -d $(includedir)/`dirname $$f` ; then \
        $(INSTALL_DIR) $(includedir)/`dirname $$f`; \
        fi; \
@@ -7437,6 +7493,7 @@ install-strip: install
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+       $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
        $(STRIP) $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
 
 install-wxconfig: 
@@ -7494,6 +7551,10 @@ install-wxconfig:
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DIR) $(libdir)
 @COND_MONOLITHIC_1_SHARED_0@   $(INSTALL_DATA) $(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a $(libdir)
 
+@COND_WXUSE_EXPAT_BUILTIN@install_wxexpat: 
+@COND_WXUSE_EXPAT_BUILTIN@     $(INSTALL_DIR) $(libdir)
+@COND_WXUSE_EXPAT_BUILTIN@     $(INSTALL_DATA) $(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
+
 @COND_WXUSE_LIBJPEG_BUILTIN@install_wxjpeg: 
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(INSTALL_DATA) $(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
@@ -7518,6 +7579,16 @@ install-wxconfig:
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DIR) $(libdir)
 @COND_WXUSE_ZLIB_BUILTIN@      $(INSTALL_DATA) $(top_builddir)lib/libwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX).a $(libdir)
 
+@COND_MONOLITHIC_0_SHARED_1@install_xmldll: 
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DIR) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_DATA) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) $(libdir)
+@COND_MONOLITHIC_0_SHARED_1@   (cd $(libdir) ; $(__xmldll___so_symlinks_inst_cmd))
+
+@COND_MONOLITHIC_0_SHARED_0@install_xmllib: 
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DIR) $(libdir)
+@COND_MONOLITHIC_0_SHARED_0@   $(INSTALL_DATA) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a $(libdir)
+
 @COND_TOOLKIT_MAC@lib/libwx_$(TOOLCHAIN_NAME).0.r: 
 @COND_TOOLKIT_MAC@     $(RESCOMP) -d __UNIX__ -useDF $(top_srcdir)/src/mac/apprsrc.r $(top_srcdir)/src/mac/carbrsrc.r $(top_srcdir)/src/mac/corersrc.r -o lib/libwx_$(TOOLCHAIN_NAME).0.rsrc
 @COND_TOOLKIT_MAC@     $(DEREZ) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc Carbon.r -useDF >lib/libwx_$(TOOLCHAIN_NAME).0.r
@@ -7526,8 +7597,8 @@ install-wxconfig:
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.r $(libdir)
 @COND_TOOLKIT_MAC@     $(INSTALL_DATA) lib/libwx_$(TOOLCHAIN_NAME).0.rsrc $(libdir)
 
-@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS)
-@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@  monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) $(LDFLAGS)   -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxexpat___depname) $(__wxzlib___depname) $(__wxodbc___depname) $(__wxregex___depname) monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) monodll_xml.o
+@COND_MONOLITHIC_1_SHARED_1@   $(SHARED_LD_CXX) $@  monodll_appbase.o monodll_clntdata.o monodll_cmdline.o monodll_config.o monodll_datetime.o monodll_datstrm.o monodll_db.o monodll_dbtable.o monodll_dircmn.o monodll_dynarray.o monodll_dynlib.o monodll_dynload.o monodll_encconv.o monodll_extended.o monodll_ffile.o monodll_file.o monodll_fileconf.o monodll_filefn.o monodll_filename.o monodll_filesys.o monodll_fmapbase.o monodll_fs_inet.o monodll_fs_zip.o monodll_ftp.o monodll_hash.o monodll_hashmap.o monodll_http.o monodll_init.o monodll_intl.o monodll_ipcbase.o monodll_list.o monodll_log.o monodll_longlong.o monodll_memory.o monodll_mimecmn.o monodll_module.o monodll_mstream.o monodll_object.o monodll_process.o monodll_protocol.o monodll_regex.o monodll_sckaddr.o monodll_sckfile.o monodll_sckipc.o monodll_sckstrm.o monodll_socket.o monodll_stopwatch.o monodll_strconv.o monodll_stream.o monodll_string.o monodll_sysopt.o monodll_textbuf.o monodll_textfile.o monodll_tokenzr.o monodll_txtstrm.o monodll_unzip.o monodll_url.o monodll_variant.o monodll_wfstream.o monodll_wxchar.o monodll_zipstrm.o monodll_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS) monodll_event.o monodll_fs_mem.o monodll_msgout.o monodll_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS) $(__MONOLIB_GUI_SRC_OBJECTS) monodll_xml.o $(LDFLAGS)   -L$(top_builddir)lib $(__monodll___macinstnamecmd) $(__monodll___importlib) $(__monodll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(EXTRALIBS_XML)
 @COND_MONOLITHIC_1_SHARED_1@   $(__monodll___so_symlinks_cmd)
 
 monodll_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
@@ -10017,6 +10088,9 @@ monodll_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
 monodll_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+monodll_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monodll_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -10026,9 +10100,9 @@ monodll_zipstrm.o: $(srcdir)/src/common/zipstrm.cpp
 monodll_zstream.o: $(srcdir)/src/common/zstream.cpp
        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1)
+@COND_MONOLITHIC_1_SHARED_0@$(top_builddir)lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX).a: monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) monolib_xml.o
 @COND_MONOLITHIC_1_SHARED_0@   rm -f $@
-@COND_MONOLITHIC_1_SHARED_0@   $(AR) rcu $@  monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1)
+@COND_MONOLITHIC_1_SHARED_0@   $(AR) rcu $@  monolib_appbase.o monolib_clntdata.o monolib_cmdline.o monolib_config.o monolib_datetime.o monolib_datstrm.o monolib_db.o monolib_dbtable.o monolib_dircmn.o monolib_dynarray.o monolib_dynlib.o monolib_dynload.o monolib_encconv.o monolib_extended.o monolib_ffile.o monolib_file.o monolib_fileconf.o monolib_filefn.o monolib_filename.o monolib_filesys.o monolib_fmapbase.o monolib_fs_inet.o monolib_fs_zip.o monolib_ftp.o monolib_hash.o monolib_hashmap.o monolib_http.o monolib_init.o monolib_intl.o monolib_ipcbase.o monolib_list.o monolib_log.o monolib_longlong.o monolib_memory.o monolib_mimecmn.o monolib_module.o monolib_mstream.o monolib_object.o monolib_process.o monolib_protocol.o monolib_regex.o monolib_sckaddr.o monolib_sckfile.o monolib_sckipc.o monolib_sckstrm.o monolib_socket.o monolib_stopwatch.o monolib_strconv.o monolib_stream.o monolib_string.o monolib_sysopt.o monolib_textbuf.o monolib_textfile.o monolib_tokenzr.o monolib_txtstrm.o monolib_unzip.o monolib_url.o monolib_variant.o monolib_wfstream.o monolib_wxchar.o monolib_zipstrm.o monolib_zstream.o $(__BASE_PLATFORM_SRC_OBJECTS_1) monolib_event.o monolib_fs_mem.o monolib_msgout.o monolib_utilscmn.o $(__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1) $(__MONOLIB_GUI_SRC_OBJECTS_1) monolib_xml.o
 @COND_MONOLITHIC_1_SHARED_0@   $(RANLIB) $@
 
 monolib_MoreFilesX.o: $(srcdir)/src/mac/morefilex/MoreFilesX.c
@@ -12518,6 +12592,9 @@ monolib_winuniv.o: $(srcdir)/src/univ/winuniv.cpp
 monolib_wxchar.o: $(srcdir)/src/common/wxchar.cpp
        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+monolib_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_USE_GUI_1@monolib_xpmdecod.o: $(srcdir)/src/common/xpmdecod.cpp
 @COND_USE_GUI_1@       $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -12529,6 +12606,20 @@ monolib_zstream.o: $(srcdir)/src/common/zstream.cpp
 
 uninstall: 
 
+@COND_WXUSE_EXPAT_BUILTIN@$(top_builddir)lib/libwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX).a: wxexpat_xmlparse.o wxexpat_xmlrole.o wxexpat_xmltok.o
+@COND_WXUSE_EXPAT_BUILTIN@     rm -f $@
+@COND_WXUSE_EXPAT_BUILTIN@     $(AR) rcu $@  wxexpat_xmlparse.o wxexpat_xmlrole.o wxexpat_xmltok.o
+@COND_WXUSE_EXPAT_BUILTIN@     $(RANLIB) $@
+
+wxexpat_xmlparse.o: $(srcdir)/src/expat/lib/xmlparse.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+
+wxexpat_xmlrole.o: $(srcdir)/src/expat/lib/xmlrole.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+
+wxexpat_xmltok.o: $(srcdir)/src/expat/lib/xmltok.c
+       $(CCC) -c -o $@ $(WXEXPAT_CFLAGS) $<
+
 @COND_WXUSE_LIBJPEG_BUILTIN@$(top_builddir)lib/libwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX).a: wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o
 @COND_WXUSE_LIBJPEG_BUILTIN@   rm -f $@
 @COND_WXUSE_LIBJPEG_BUILTIN@   $(AR) rcu $@  wxjpeg_jcomapi.o wxjpeg_jutils.o wxjpeg_jerror.o wxjpeg_jmemmgr.o wxjpeg_jmemnobs.o wxjpeg_jcapimin.o wxjpeg_jcapistd.o wxjpeg_jctrans.o wxjpeg_jcparam.o wxjpeg_jdatadst.o wxjpeg_jcinit.o wxjpeg_jcmaster.o wxjpeg_jcmarker.o wxjpeg_jcmainct.o wxjpeg_jcprepct.o wxjpeg_jccoefct.o wxjpeg_jccolor.o wxjpeg_jcsample.o wxjpeg_jchuff.o wxjpeg_jcphuff.o wxjpeg_jcdctmgr.o wxjpeg_jfdctfst.o wxjpeg_jfdctflt.o wxjpeg_jfdctint.o wxjpeg_jdapimin.o wxjpeg_jdapistd.o wxjpeg_jdtrans.o wxjpeg_jdatasrc.o wxjpeg_jdmaster.o wxjpeg_jdinput.o wxjpeg_jdmarker.o wxjpeg_jdhuff.o wxjpeg_jdphuff.o wxjpeg_jdmainct.o wxjpeg_jdcoefct.o wxjpeg_jdpostct.o wxjpeg_jddctmgr.o wxjpeg_jidctfst.o wxjpeg_jidctflt.o wxjpeg_jidctint.o wxjpeg_jidctred.o wxjpeg_jdsample.o wxjpeg_jdcolor.o wxjpeg_jquant1.o wxjpeg_jquant2.o wxjpeg_jdmerge.o
@@ -12952,8 +13043,23 @@ wxzlib_uncompr.o: $(srcdir)/src/zlib/uncompr.c
 wxzlib_zutil.o: $(srcdir)/src/zlib/zutil.c
        $(CCC) -c -o $@ $(WXZLIB_CFLAGS) $<
 
+@COND_MONOLITHIC_0_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)$(WXDLLNAMEPREFIX)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3): $(__wxzlib___depname) $(__wxregex___depname) xmldll_xml.o $(__basedll___depname)
+@COND_MONOLITHIC_0_SHARED_1@   $(SHARED_LD_CXX) $@  xmldll_xml.o $(LDFLAGS)   -L$(top_builddir)lib $(__xmldll___macinstnamecmd) $(__xmldll___importlib) $(__xmldll___soname_flags) $(dll___macver)  $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)$(DLLIMPEXT) $(EXTRALIBS_XML)
+@COND_MONOLITHIC_0_SHARED_1@   $(__xmldll___so_symlinks_cmd)
+
+xmldll_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(XMLDLL_CXXFLAGS) $<
+
+@COND_MONOLITHIC_0_SHARED_0@$(top_builddir)lib/libwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml-2.5$(HOST_SUFFIX).a: xmllib_xml.o
+@COND_MONOLITHIC_0_SHARED_0@   rm -f $@
+@COND_MONOLITHIC_0_SHARED_0@   $(AR) rcu $@  xmllib_xml.o
+@COND_MONOLITHIC_0_SHARED_0@   $(RANLIB) $@
+
+xmllib_xml.o: $(srcdir)/src/xml/xml.cpp
+       $(CXXC) -c -o $@ $(XMLLIB_CXXFLAGS) $<
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 
-.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib uninstall
+.PHONY: all clean distclean install install_basedll install_baselib install_coredll install_corelib install_gldll install_gllib install_htmldll install_htmllib install_monodll install_monolib install_wxexpat install_wxjpeg install_wxodbc install_wxpng install_wxregex install_wxtiff install_wxzlib install_xmldll install_xmllib uninstall
index fd1286f42772e6300a48856e0e90abd783084f0d..e5102bbb80a7ff9a89635101b4623bbfce196593 100644 (file)
@@ -1,5 +1,5 @@
 dnl This macro was generated by
-dnl Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
     dnl Conditions:
@@ -418,3 +418,9 @@ dnl ### begin block COND_SHARED_0 ###
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
+dnl ### begin block COND_WXUSE_EXPAT_BUILTIN ###
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""
+    fi
+    AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
index 5ae2cbab67c909ed15ee474d109533d89e9b3636..c1e1a6e8522db095aaacdc0c58d173fa50a2cb34 100755 (executable)
--- a/configure
+++ b/configure
@@ -311,7 +311,8 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
+ac_subdirs_all="$ac_subdirs_all src/expat"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE YACC LEX LEXLIB LEX_OUTPUT_ROOT LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG HOST_SUFFIX SET_MAKE MAKE_SET INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX SO_SUFFIX DLLPREFIX AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING COND_BUILD_DEBUG COND_BUILD_RELEASE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MGL_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_OS2 COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_PLATFORM_MAC_1 COND_SHARED_1 COND_SHARED_0 COND_WXUSE_EXPAT_BUILTIN LEX_STEM PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS NM LD MAKEINFO INSTALL_LIBRARY ESD_LINK LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1048,6 +1049,7 @@ Optional Packages:
   --with-regex            enable support for wxRegEx class
   --with-zlib             use zlib for LZW compression
   --with-odbc             use the IODBC and wxODBC classes
+  --with-expat            enable XML support using expat parser
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
   --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
   --with-x                use the X Window System
@@ -1967,6 +1969,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONTROLS=no
 
   DEFAULT_wxUSE_REGEX=no
+  DEFAULT_wxUSE_XML=no
+  DEFAULT_wxUSE_EXPAT=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
@@ -2140,6 +2144,8 @@ else
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_REGEX=yes
+  DEFAULT_wxUSE_XML=yes
+  DEFAULT_wxUSE_EXPAT=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
@@ -3006,6 +3012,65 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b
           fi
 
 
+          echo "$as_me:$LINENO: checking for --with-expat" >&5
+echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6
+          no_cache=0
+
+# Check whether --with-expat or --without-expat was given.
+if test "${with_expat+set}" = set; then
+  withval="$with_expat"
+
+                        if test "$withval" = yes; then
+                          ac_cv_use_expat='wxUSE_EXPAT=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_expat='wxUSE_EXPAT=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_expat='wxUSE_EXPAT=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_expat='wxUSE_EXPAT=builtin'
+                        else
+                          { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
+echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
+   { (exit 1); exit 1; }; }
+                        fi
+
+else
+
+                        LINE=`grep "wxUSE_EXPAT" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_expat='wxUSE_EXPAT='$DEFAULT_wxUSE_EXPAT
+
+fi;
+
+          eval "$ac_cv_use_expat"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_expat >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_EXPAT" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          elif test "$wxUSE_EXPAT" = no; then
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          elif test "$wxUSE_EXPAT" = sys; then
+            echo "$as_me:$LINENO: result: system version" >&5
+echo "${ECHO_T}system version" >&6
+          elif test "$wxUSE_EXPAT" = builtin; then
+            echo "$as_me:$LINENO: result: builtin version" >&5
+echo "${ECHO_T}builtin version" >&6
+          else
+            { { echo "$as_me:$LINENO: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&5
+echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
+   { (exit 1); exit 1; }; }
+          fi
+
+
 
 
          enablestring=
@@ -19002,6 +19067,233 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
 fi
 
 
+if test "$wxUSE_EXPAT" != "no"; then
+    wxUSE_XML=1
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_EXPAT 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XML 1
+_ACEOF
+
+
+    if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
+        if test "${ac_cv_header_expat_h+set}" = set; then
+  echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+else
+  # Is the header compilable?
+echo "$as_me:$LINENO: checking expat.h usability" >&5
+echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <expat.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking expat.h presence" >&5
+echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <expat.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+  yes:no )
+    { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+  no:yes )
+    { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+    (
+      cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf@gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+    ) |
+      sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+echo "$as_me:$LINENO: checking for expat.h" >&5
+echo $ECHO_N "checking for expat.h... $ECHO_C" >&6
+if test "${ac_cv_header_expat_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_expat_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+echo "${ECHO_T}$ac_cv_header_expat_h" >&6
+
+fi
+
+
+        if test "$ac_cv_header_expat_h" = "yes"; then
+            echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lexpat  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XML_ParserCreate ();
+int
+main ()
+{
+XML_ParserCreate ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_expat_XML_ParserCreate=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_expat_XML_ParserCreate=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
+if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+  EXPAT_LINK=" -lexpat"
+fi
+
+        fi
+        if test "x$EXPAT_LINK" = "x" ; then
+            if test "$wxUSE_EXPAT" = "sys" ; then
+                { { echo "$as_me:$LINENO: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&5
+echo "$as_me: error: system expat library not found! Use --with-expat=builtin to use built-in version" >&2;}
+   { (exit 1); exit 1; }; }
+            else
+                { echo "$as_me:$LINENO: WARNING: system expat library not found, will use built-in instead" >&5
+echo "$as_me: WARNING: system expat library not found, will use built-in instead" >&2;}
+                wxUSE_EXPAT=builtin
+            fi
+        else
+                        wxUSE_EXPAT=sys
+        fi
+    fi
+    if test "$wxUSE_EXPAT" = "builtin" ; then
+
+
+subdirs="$subdirs src/expat"
+
+    fi
+fi
+
+
+
 AFMINSTALL=
 WIN32INSTALL=
 
@@ -33162,6 +33454,7 @@ CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXW
 
 LIBS=`echo $LIBS | sed 's/ \+/ /g'`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+EXTRALIBS_XML="$EXPAT_LINK"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
 fi
@@ -33190,6 +33483,7 @@ fi
 
 
 
+
 if test $wxUSE_MONOLITHIC = "yes" ; then
     MONOLITHIC=1
 else
@@ -33209,6 +33503,7 @@ OFFICIAL_BUILD=0
 
 
 
+
 TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [A-Z] [a-z]`
 
 
         COND_SHARED_0=""
     fi
 
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""
+    fi
+
 
 
 
@@ -35303,6 +35603,7 @@ s,@LEXLIB@,$LEXLIB,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
 s,@LN_S@,$LN_S,;t t
 s,@CXXCPP@,$CXXCPP,;t t
+s,@subdirs@,$subdirs,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
 s,@GTK_LIBS@,$GTK_LIBS,;t t
@@ -35323,6 +35624,7 @@ s,@SETFILE@,$SETFILE,;t t
 s,@LIBICONV@,$LIBICONV,;t t
 s,@wxUSE_ZLIB@,$wxUSE_ZLIB,;t t
 s,@wxUSE_REGEX@,$wxUSE_REGEX,;t t
+s,@wxUSE_EXPAT@,$wxUSE_EXPAT,;t t
 s,@wxUSE_ODBC@,$wxUSE_ODBC,;t t
 s,@wxUSE_LIBJPEG@,$wxUSE_LIBJPEG,;t t
 s,@wxUSE_LIBPNG@,$wxUSE_LIBPNG,;t t
@@ -35332,6 +35634,7 @@ s,@OFFICIAL_BUILD@,$OFFICIAL_BUILD,;t t
 s,@WXUNIV@,$WXUNIV,;t t
 s,@MONOLITHIC@,$MONOLITHIC,;t t
 s,@EXTRALIBS@,$EXTRALIBS,;t t
+s,@EXTRALIBS_XML@,$EXTRALIBS_XML,;t t
 s,@EXTRALIBS_GUI@,$EXTRALIBS_GUI,;t t
 s,@EXTRALIBS_OPENGL@,$EXTRALIBS_OPENGL,;t t
 s,@UNICODE@,$UNICODE,;t t
@@ -35432,6 +35735,7 @@ s,@COND_WXUSE_ZLIB_BUILTIN@,$COND_WXUSE_ZLIB_BUILTIN,;t t
 s,@COND_PLATFORM_MAC_1@,$COND_PLATFORM_MAC_1,;t t
 s,@COND_SHARED_1@,$COND_SHARED_1,;t t
 s,@COND_SHARED_0@,$COND_SHARED_0,;t t
+s,@COND_WXUSE_EXPAT_BUILTIN@,$COND_WXUSE_EXPAT_BUILTIN,;t t
 s,@LEX_STEM@,$LEX_STEM,;t t
 s,@PATH_IFS@,$PATH_IFS,;t t
 s,@WX_MAJOR_VERSION_NUMBER@,$WX_MAJOR_VERSION_NUMBER,;t t
@@ -36050,6 +36354,150 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
+#
+# CONFIG_SUBDIRS section.
+#
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case $ac_arg in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
+    | --c=*)
+      ;;
+    --config-cache | -C)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+      ac_prev=prefix ;;
+    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  # Always prepend --prefix to ensure using the same prefix
+  # in subdir configurations.
+  ac_sub_configure_args="--prefix=$prefix $ac_sub_configure_args"
+
+  ac_popdir=`pwd`
+  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    test -d $srcdir/$ac_dir || continue
+
+    { echo "$as_me:$LINENO: configuring in $ac_dir" >&5
+echo "$as_me: configuring in $ac_dir" >&6;}
+    { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir="$ac_dir"
+    as_dirs=
+    while test ! -d "$as_dir"; do
+      as_dirs="$as_dir $as_dirs"
+      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$as_dir" : 'X\(//\)[^/]' \| \
+         X"$as_dir" : 'X\(//\)$' \| \
+         X"$as_dir" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+         /^X\(\/\/\)$/{ s//\1/; q; }
+         /^X\(\/\).*/{ s//\1/; q; }
+         s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
+    ac_builddir=.
+
+if test "$ac_dir" != .; then
+  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  # A "../" for each directory in $ac_dir_suffix.
+  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+  ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+  .)  # No --srcdir option.  We are building in place.
+    ac_srcdir=.
+    if test -z "$ac_top_builddir"; then
+       ac_top_srcdir=.
+    else
+       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+    fi ;;
+  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir ;;
+  *) # Relative path.
+    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+
+    cd $ac_dir
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_srcdir/configure.gnu; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure.gnu'"
+    elif test -f $ac_srcdir/configure; then
+      ac_sub_configure="$SHELL '$ac_srcdir/configure'"
+    elif test -f $ac_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      { echo "$as_me:$LINENO: WARNING: no configuration information is in $ac_dir" >&5
+echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+      # Make the cache file name correct relative to the subdirectory.
+      case $cache_file in
+      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file=$ac_top_builddir$cache_file ;;
+      esac
+
+      { echo "$as_me:$LINENO: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
+echo "$as_me: running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
+      # The eval makes quoting arguments work.
+      eval $ac_sub_configure $ac_sub_configure_args \
+           --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir ||
+        { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5
+echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
+   { (exit 1); exit 1; }; }
+    fi
+
+    cd $ac_popdir
+  done
+fi
+
 
 echo
 echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
index b20b643463612c46c32abd7e68c339c72f1f4d68..7891e02704d318b4965546bca94c8f261dccafc8 100644 (file)
@@ -360,6 +360,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONTROLS=no
 
   DEFAULT_wxUSE_REGEX=no
+  DEFAULT_wxUSE_XML=no
+  DEFAULT_wxUSE_EXPAT=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
@@ -533,6 +535,8 @@ else
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_REGEX=yes
+  DEFAULT_wxUSE_XML=yes
+  DEFAULT_wxUSE_EXPAT=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
@@ -736,6 +740,7 @@ WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http:
 WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
 WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
 WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
+WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
 
 dnl ---------------------------------------------------------------------------
 dnl compile options
@@ -2039,6 +2044,39 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
     fi
 fi
 
+dnl ------------------------------------------------------------------------
+dnl Check for expat libraries
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_EXPAT" != "no"; then
+    wxUSE_XML=1
+    AC_DEFINE(wxUSE_EXPAT)
+    AC_DEFINE(wxUSE_XML)
+    
+    if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then           
+        AC_CHECK_HEADER(expat.h)
+        if test "$ac_cv_header_expat_h" = "yes"; then
+            AC_CHECK_LIB(expat, XML_ParserCreate, EXPAT_LINK=" -lexpat")
+        fi
+        if test "x$EXPAT_LINK" = "x" ; then
+            if test "$wxUSE_EXPAT" = "sys" ; then
+                AC_MSG_ERROR([system expat library not found! Use --with-expat=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system expat library not found, will use built-in instead])
+                wxUSE_EXPAT=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_EXPAT=sys
+        fi
+    fi
+    if test "$wxUSE_EXPAT" = "builtin" ; then
+        dnl Expat needs this:
+        AC_CONFIG_SUBDIRS([src/expat])
+    fi
+fi
+
+
 dnl ----------------------------------------------------------------
 dnl search for toolkit (widget sets)
 dnl ----------------------------------------------------------------
@@ -5383,6 +5421,7 @@ CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXW
 
 LIBS=`echo $LIBS | sed 's/ \+/ /g'`
 EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+EXTRALIBS_XML="$EXPAT_LINK"
 if test "$wxUSE_GUI" = "yes"; then
     EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
 fi
@@ -5407,6 +5446,7 @@ fi
 
 AC_SUBST(wxUSE_ZLIB)
 AC_SUBST(wxUSE_REGEX)
+AC_SUBST(wxUSE_EXPAT)
 AC_SUBST(wxUSE_ODBC)
 AC_SUBST(wxUSE_LIBJPEG)
 AC_SUBST(wxUSE_LIBPNG)
@@ -5427,6 +5467,7 @@ AC_SUBST(OFFICIAL_BUILD)
 AC_SUBST(WXUNIV)
 AC_SUBST(MONOLITHIC)
 AC_SUBST(EXTRALIBS)
+AC_SUBST(EXTRALIBS_XML)
 AC_SUBST(EXTRALIBS_GUI)
 AC_SUBST(EXTRALIBS_OPENGL)
 AC_SUBST(UNICODE)
@@ -5695,6 +5736,7 @@ echo "                                       regex              ${wxUSE_REGEX}"
 echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
 echo "                                       zlib               ${wxUSE_ZLIB}"
 echo "                                       odbc               ${wxUSE_ODBC}"
+echo "                                       expat              ${wxUSE_EXPAT}"
 
 echo ""
 
index 57b110ba55d5e5c96a4b2de3f35dd225c3f05575..954490d8f7cdf5b4e5202e092a857c3317f0f9e6 100644 (file)
  * Use regex support
  */
 #define wxUSE_REGEX 0
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 0
 /*
  * Use zlib
  */