sept 2006 release

2024-12-25 21:58:21 +01:00 · 2006-09-12 21:21:48 +00:00 · 2006-09-12 21:21:48 +00:00 · ecf4f74304
commit ecf4f74304
parent cdb0a79b0f
91 changed files with 12682 additions and 2499 deletions
--- a/1
+++ b/1
@ -0,0 +1 @@
+Jez Higgins, jez@jezuk.co.uk
--- a/Arabica.sln
+++ b/Arabica.sln
@ -1,66 +1,21 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAXSimpleHandler", "examples\SAX\SimpleHandler.vcproj", "{16475ED0-2906-429B-9E73-F2BF2929F6E9}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "vs7\lib_arabica.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAXWriter", "EXAMPLES\SAX\Writer.vcproj", "{3C6CBC24-07D4-4DE8-A1DF-592C3BC77C56}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "vs7\test_DOM.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAXPyx", "examples\SAX\pyx.vcproj", "{AE33D6D1-0F57-4E97-90AE-696854C5AE71}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "vs7\test_DOM_silly.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_DOMWriter", "examples\SAX2DOM\DOMWriter.vcproj", "{C1CF7801-1681-4F15-8D71-BBC814805AF2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_UtilsTranscode", "examples\Utils\transcode.vcproj", "{436B423B-BF20-4B2E-A187-604AF391FBE2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_XMLBase", "examples\SAX\example_XMLBase.vcproj", "{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath", "test\XPath\xpathic.vcproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAX2DOM", "test\SAX2DOM\SAX2DOM_test.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_xgrep", "examples\XPath\xgrep.vcproj", "{5F7B038E-5148-4EF4-AB43-5035F666D00D}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_silly", "test\XPath_silly\xpathic_silly.vcproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_xpath_wide", "test\XPath_wide\xpathic_wide.vcproj", "{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test\DOM\DOM_test.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_silly", "test\DOM_silly\DOM_test_silly.vcproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "test\DOM_wide\DOM_test_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_SAXFilter", "test\SAX\FilterTest.vcproj", "{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "src\SAX.vcproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM_wide", "vs7\test_DOM_wide.vcproj", "{DE6FD811-12BD-4914-BA29-CD987C4B0D48}"
 	ProjectSection(ProjectDependencies) = postProject
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC} = {4CA72415-D03A-4447-BE4E-C093A5146CAC}
 	EndProjectSection
 EndProject
 Global
@ -69,50 +24,10 @@ Global
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{16475ED0-2906-429B-9E73-F2BF2929F6E9}.Debug.ActiveCfg = Debug|Win32
-		{16475ED0-2906-429B-9E73-F2BF2929F6E9}.Debug.Build.0 = Debug|Win32
-		{16475ED0-2906-429B-9E73-F2BF2929F6E9}.Release.ActiveCfg = Release|Win32
-		{16475ED0-2906-429B-9E73-F2BF2929F6E9}.Release.Build.0 = Release|Win32
-		{3C6CBC24-07D4-4DE8-A1DF-592C3BC77C56}.Debug.ActiveCfg = Debug|Win32
-		{3C6CBC24-07D4-4DE8-A1DF-592C3BC77C56}.Debug.Build.0 = Debug|Win32
-		{3C6CBC24-07D4-4DE8-A1DF-592C3BC77C56}.Release.ActiveCfg = Debug|Win32
-		{3C6CBC24-07D4-4DE8-A1DF-592C3BC77C56}.Release.Build.0 = Debug|Win32
-		{AE33D6D1-0F57-4E97-90AE-696854C5AE71}.Debug.ActiveCfg = Debug|Win32
-		{AE33D6D1-0F57-4E97-90AE-696854C5AE71}.Debug.Build.0 = Debug|Win32
-		{AE33D6D1-0F57-4E97-90AE-696854C5AE71}.Release.ActiveCfg = Release|Win32
-		{AE33D6D1-0F57-4E97-90AE-696854C5AE71}.Release.Build.0 = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug.ActiveCfg = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Debug.Build.0 = Debug|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release.ActiveCfg = Release|Win32
-		{C1CF7801-1681-4F15-8D71-BBC814805AF2}.Release.Build.0 = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug.ActiveCfg = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Debug.Build.0 = Debug|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release.ActiveCfg = Release|Win32
-		{436B423B-BF20-4B2E-A187-604AF391FBE2}.Release.Build.0 = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug.ActiveCfg = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Debug.Build.0 = Debug|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release.ActiveCfg = Release|Win32
-		{1E3CEC10-26EB-40C0-AC9A-72020BD5A40A}.Release.Build.0 = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.ActiveCfg = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.Build.0 = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.ActiveCfg = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.Build.0 = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.ActiveCfg = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.Build.0 = Debug|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release.ActiveCfg = Release|Win32
-		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release.Build.0 = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug.ActiveCfg = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Debug.Build.0 = Debug|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release.ActiveCfg = Release|Win32
-		{5F7B038E-5148-4EF4-AB43-5035F666D00D}.Release.Build.0 = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.ActiveCfg = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.Build.0 = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.ActiveCfg = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.Build.0 = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.ActiveCfg = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Debug.Build.0 = Debug|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.ActiveCfg = Release|Win32
-		{B3C75B3A-BB0A-4B23-87F9-FB9CD98FF8CE}.Release.Build.0 = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug.ActiveCfg = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug.Build.0 = Debug|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release.ActiveCfg = Release|Win32
+		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release.Build.0 = Release|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.ActiveCfg = Debug|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Debug.Build.0 = Debug|Win32
 		{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}.Release.ActiveCfg = Release|Win32
@ -125,14 +40,6 @@ Global
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Debug.Build.0 = Debug|Win32
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release.ActiveCfg = Release|Win32
 		{DE6FD811-12BD-4914-BA29-CD987C4B0D48}.Release.Build.0 = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug.ActiveCfg = Debug|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Debug.Build.0 = Debug|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release.ActiveCfg = Release|Win32
-		{A21EA5E3-7353-4856-8C8F-8129FEBEA7E2}.Release.Build.0 = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug.ActiveCfg = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Debug.Build.0 = Debug|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release.ActiveCfg = Release|Win32
-		{4CA72415-D03A-4447-BE4E-C093A5146CAC}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
--- a/33
+++ b/33
@ -0,0 +1,33 @@
+Copyright 2002-2006 Jez UK Ltd
+All rights reserved
+
+Redistribution and use in source and binary forms, with or 
+without modification, are permitted provided that the following
+conditions are met:
+
+    * Redistributions of source code must retain the above 
+      copyright notice, this list of conditions and the following
+      disclaimer.
+    * Redistributions in binary form must reproduce the above 
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials 
+      provided with the distribution.
+    * Neither the name of Jez UK Ltd nor the names of
+      contributors may be used to endorse or promote products 
+      derived from this software without specific prior written 
+      permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR 
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
--- a/236
+++ b/236
@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
--- a/33
+++ b/33
@ -1,33 +0,0 @@
-
-include Makefile.header
-
-######################################
-# High level rules
-all : 
-	cd src; ${MAKE}
-	cd test; ${MAKE}
-	cd examples; ${MAKE}
-
-clean :
-	cd src; ${MAKE} clean
-	cd test; ${MAKE} clean
-	cd examples; ${MAKE} clean
-	rm -f arabica.tar.gz
-	rm -f arabica.zip
-
-dist: tar zip
-
-
-tar: clean
-	cd ..; tar zcvf arabica/arabica.tar.gz --exclude CVS arabica
-
-zip: clean
-	cd ..;  zip -rv9 arabica/arabica.zip arabica -x arabica/arabica.tar.gz -x \*/CVS/\*
-
-
-#/////////////////////////////////////////////////////////////////////////
-#//////////////////////////////////////////////
-
-# End of File
-
-
--- a/Makefile.am
+++ b/Makefile.am
@ -0,0 +1,38 @@
+
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS= src test examples
+
+install-data-local:
+	@echo "------------------------------------------------------------"
+	@echo "Installing include files to $(includedir)"
+	@echo "------------------------------------------------------------"
+	for inc in `cd $(srcdir)/include && find . -type f -print | grep -v \.svn`; \
+	  do $(INSTALL_HEADER) -D "$(srcdir)/include/$$inc" "$(includedir)/$$inc"; \
+	done 
+
+uninstall-local:
+	@echo "------------------------------------------------------------"
+	@echo "Removing include files from $(includedir)"
+	@echo "------------------------------------------------------------"
+	for inc in `cd $(srcdir)/include && find . -type f -print | grep -v \.svn`; \
+	  do rm -rf "$(includedir)/$$inc"; \
+	done 
+	for dir in `cd $(srcdir)/include && find . -type d -print | grep -v \.svn`; \
+	  do rm -rf "$(includedir)/$$dir"; \
+	done 
+
+DIST_SUBDIRS= src test examples 
+EXTRA_DIST=vs7 \
+           include \
+           src/SAX/wrappers/saxexpat.cpp \
+           src/SAX/wrappers/saxlibxml2.cpp \
+           src/SAX/wrappers/saxxerces.cpp \
+           src/Utils/impl/codecvt_specialisations.cpp 
+dist-hook:
+	find $(distdir) -print | grep \.svn | xargs rm -rf
+	find $(distdir) -print | grep \~$ | xargs rm -rf
+
+pkgconfigdir = src/pkgconfig
+pkgconfig_DATA = arabica-aug2006.pc
+
--- a/Makefile.common
+++ b/Makefile.common
@ -1,17 +0,0 @@
-CPPUNIT_DIR = ../CppUnit
-
-CPPUNITFW_FILES = TestCase.cpp TestFailure.cpp TestResult.cpp TestSuite.cpp
-CPPUNITFW_SRCS = $(patsubst Test%,$(CPPUNIT_DIR)/framework/Test%,$(CPPUNITFW_FILES))
-CPPUNITFW_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITFW_SRCS))
-
-CPPUNITUI_FILES = TextTestResult.cpp
-CPPUNITUI_SRCS = $(patsubst Text%,$(CPPUNIT_DIR)/textui/Text%,$(CPPUNITUI_FILES))
-CPPUNITUI_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITUI_SRCS))
-
-CPPUNITRUNNER_FILES = TestRunner.cpp
-CPPUNITRUNNER_SRCS = $(patsubst Test%,$(CPPUNIT_DIR)/Test%,$(CPPUNITRUNNER_FILES))
-CPPUNITRUNNER_OBJS = $(patsubst %.cpp,%.o,$(CPPUNITRUNNER_SRCS))
-
-CPPUNIT_OBJS = $(CPPUNITFW_OBJS) $(CPPUNITUI_OBJS) $(CPPUNITRUNNER_OBJS)
-
-
--- a/Makefile.header
+++ b/Makefile.header
@ -1,51 +0,0 @@
-include Makefile.common
-
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_EXPAT -DARABICA_NO_WCHAR_T
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = gcc 
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  gcc 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-
-CXXFLAGS = -Wall 
-LDFLAGS = 
-
-# Includes and library directories 
-INCS_DIRS = -I.. -I/home/jez/arabica/arabica/include -I/cygdrive/c/usr/include/
-LIBS_DIRS =
-
-STATIC_LIBS =
-DYNAMIC_LIBS = -lwsock32 -lexpat -lstdc++ 
-
-# link flag to create a shared library
-LINK_SHARED = -shared
-
-EXESUFFIX = .exe
-LIBSUFFIX = .dll
-
-
-
--- a/Makefile.header.cygwin
+++ b/Makefile.header.cygwin
@ -1,51 +0,0 @@
-include Makefile.common
-
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_EXPAT -DARABICA_NO_WCHAR_T
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = gcc 
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  gcc 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-
-CXXFLAGS = -Wall 
-LDFLAGS = 
-
-# Includes and library directories 
-INCS_DIRS = -I.. 
-LIBS_DIRS = 
-
-STATIC_LIBS =
-DYNAMIC_LIBS =  -lexpat -lstdc++
-
-# link flag to create a shared library
-LINK_SHARED = -shared
-
-EXESUFFIX = .exe
-LIBSUFFIX = .dll
-
-
-
--- a/Makefile.header.darwin
+++ b/Makefile.header.darwin
@ -1,50 +0,0 @@
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_LIBXML2 
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = gcc 
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  g++ 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-
-CXXFLAGS = -Wall -Wno-long-double
-LDFLAGS = 
-
-# Includes and library directories 
-INCS_DIRS = -I..  -I/usr/include/libxml2
-LIBS_DIRS = 
-
-# OSX includes libxml2
-STATIC_LIBS =
-DYNAMIC_LIBS =  -lxml2 -lstdc++ 
-
-# link flag to create a shared library
-LINK_SHARED = -dynamiclib
-
-EXESUFFIX = 
-LIBSUFFIX = .dylib
-
-
-
--- a/Makefile.header.linux
+++ b/Makefile.header.linux
@ -1,51 +0,0 @@
-include Makefile.common
-
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_LIBXML2 
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = g++
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  gcc 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-
-CXXFLAGS = -Wall 
-LDFLAGS = 
-
-# Includes and library directories 
-INCS_DIRS = -I/usr/include/libxml2 
-LIBS_DIRS = 
-
-STATIC_LIBS =
-DYNAMIC_LIBS =  -lxml2 -lstdc++ 
-
-# flag to create a shared library
-LINK_SHARED = -shared
-
-EXESUFFIX = 
-LIBSUFFIX = .so
-
-
-
--- a/Makefile.header.osx
+++ b/Makefile.header.osx
@ -1,50 +0,0 @@
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_LIBXML2 
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = gcc 
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  gcc 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-
-CXXFLAGS = -Wall 
-LDFLAGS = 
-
-# Includes and library directories 
-INCS_DIRS = -I..  -I/usr/include/libxml2
-LIBS_DIRS = 
-
-# OSX includes libxml2
-STATIC_LIBS =
-DYNAMIC_LIBS =  -lxml2 -lstdc++ 
-
-# link flag to create a shared library
-LINK_SHARED = -dynamiclib
-
-EXESUFFIX = 
-LIBSUFFIX = .dylib
-
-
-
--- a/Makefile.header.solaris7_gcc
+++ b/Makefile.header.solaris7_gcc
@ -1,52 +0,0 @@
-####################################
-# ARABICA CONFIG
-# edit for your parser choice - may include more than one USE_*
-PARSER_CONFIG = -DUSE_EXPAT -DARABICA_NO_WCHAR_T
-#PARSER_CONFIG = -DUSE_EXPAT -DUSE_LIBXML2 -DUSE_XERCES -DUSE_GARDEN
-
-####################################
-# TOOLS
-#####
-MAKE = make
-# C++ compiler
-CXX = gcc 
-# preprocessor
-CPP = gcc -E
-# linker
-LD =  gcc 
-# archiver
-AR = ar r
-
-###########
-# Utilities
-REMOVE = rm -rf
-LINK = ln -sf
-COPY = cp -f
-
-######################################
-# BUILD FLAGS
-# you probably want to set some these according to
-# your parser choice
-# eg DYNAMIC_LIBS = -lexpat
-EXPAT_PATH = /data1/home/jhiggins/expat
-
-CXXFLAGS = -Wall -fPIC
-# need these -Rs to tell the linker the runtime location of these libraries
-# I had them installed in wacky places, because I don't have root privs
-LDFLAGS = -R$(EXPAT_PATH)/lib -R/usr/local/lib -R/data1/home/jhiggins/arabica/bin
-
-# Includes and library directories 
-INCS_DIRS = -I.. -I$(EXPAT_PATH)/include
-LIBS_DIRS = -L$(EXPAT_PATH)/lib
-
-STATIC_LIBS =
-DYNAMIC_LIBS =  -lexpat -lstdc++ -lsocket
-
-# link flag to create a shared library
-LINK_SHARED = -shared
-
-EXESUFFIX = 
-LIBSUFFIX = .so
-
-
-
--- a/Makefile.rules
+++ b/Makefile.rules
@ -1,5 +0,0 @@
-##########################################
-# Basic rules
-%.o : %.cpp
-	$(CXX) $(CXXFLAGS) $(INCS_DIRS) -c -o $@ $<
-
--- a/2
+++ b/2
@ -0,0 +1,2 @@
+For latest Arabica news, please see http://www.jezuk.co.uk/arabica
+
--- a/0
+++ b/0
--- a/arabica.pc.in
+++ b/arabica.pc.in
@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Arabica
+Description: XML Parser Toolkit for C++
+Libs: -L${libdir} -larabica
+Cflags:
--- a/autogen.sh
+++ b/autogen.sh
@ -0,0 +1,48 @@
+#! /bin/sh
+
+# $Id: autogen.sh,v 1.4 2002/12/02 01:39:49 murrayc Exp $
+#
+# Copyright (c) 2002  Daniel Elstner  <daniel.elstner@gmx.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License VERSION 2 as
+# published by the Free Software Foundation.  You are not allowed to
+# use any other version of the license; unless you got the explicit
+# permission from the author to do so.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+dir=`echo "$0" | sed 's,[^/]*$,,'`
+test "x${dir}" = "x" && dir='.'
+
+if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`"
+then
+    echo "This script must be executed directly from the source directory."
+    exit 1
+fi
+
+rm -f config.cache acconfig.h
+
+echo "- libtoolize."		&& \
+libtoolize --force		&& \
+echo "- aclocal."		&& \
+aclocal	-I m4			&& \
+echo "- autoconf."		&& \
+autoconf			&& \
+echo "- autoheader."		&& \
+autoheader			&& \
+echo "- automake."		&& \
+automake --add-missing --gnu	&& \
+echo				&& \
+./configure "$@"		&& exit 0
+
+exit 1
+
--- a/config.guess
+++ b/config.guess
--- a/config.sub
+++ b/config.sub
--- a/configure.ac
+++ b/configure.ac
@ -0,0 +1,32 @@
+AC_INIT(src/arabica.cpp)
+AC_CONFIG_HEADERS(include/SAX/ArabicaConfig.h)
+
+AM_INIT_AUTOMAKE(arabica, Sept2006)
+
+AC_PROG_CXX
+AM_PROG_LIBTOOL
+
+AC_LANG_CPLUSPLUS
+
+ARABICA_HAS_BOOST([1.32])
+ARABICA_HAS_EXPAT
+ARABICA_HAS_LIBXML2
+ARABICA_HAS_XERCES
+ARABICA_HAS_XML_PARSER
+ARABICA_HAS_STD_WSTRING
+ARABICA_CHECK_CODECVT_SPECIALISATIONS
+
+AC_OUTPUT(Makefile \
+          arabica.pc \
+          src/Makefile \
+          test/Makefile \
+          test/DOM/Makefile \
+          test/SAX2DOM/Makefile \
+          test/XPath/Makefile \
+          examples/Makefile \
+          examples/SAX/Makefile \
+          examples/DOM/Makefile \
+          examples/Utils/Makefile \
+          examples/XPath/Makefile 
+)
+
--- a/530
+++ b/530
@ -0,0 +1,530 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2005-07-09.11
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mecanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/examples/SAX2DOM/DOMWriter.cpp
+++ b/examples/SAX2DOM/DOMWriter.cpp
--- a/examples/SAX2DOM/DOMWriter.dsp
+++ b/examples/SAX2DOM/DOMWriter.dsp
--- a/examples/DOM/Makefile.am
+++ b/examples/DOM/Makefile.am
@ -0,0 +1,8 @@
+bin_PROGRAMS = domwriter
+
+LIBARABICA = $(top_builddir)/src/libarabica.la
+
+domwriter_SOURCES = DOMWriter.cpp
+domwriter_LDADD = $(LIBARABICA)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
--- a/examples/Makefile
+++ b/examples/Makefile
@ -1,18 +0,0 @@
-include Makefile.header 
-
-# High level rules
-all : 
-	${MAKE} --directory=SAX
-	${MAKE} --directory=SAX2DOM
-	${MAKE} --directory=XPath
-	${MAKE} --directory=Utils
-
-# Cleaning up
-
-clean :
-	${MAKE} --directory=SAX clean
-	${MAKE} --directory=SAX2DOM clean
-	${MAKE} --directory=XPath clean
-	${MAKE} --directory=Utils clean
-
-# End of File
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@ -0,0 +1,4 @@
+SUBDIRS = SAX DOM Utils XPath
+
+install:
+	echo "Nothing to install here"
--- a/examples/SAX/Makefile
+++ b/examples/SAX/Makefile
@ -1,69 +0,0 @@
-
-include ../../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-PYX_SRCS = pyx.cpp
-PYX_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(PYX_SRCS)))
-PYX_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(PYX_SRCS)))
-
-SIMPLE_SRCS = wrapper.cpp SimpleHandler.cpp
-SIMPLE_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SIMPLE_SRCS)))
-SIMPLE_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SIMPLE_SRCS)))
-
-WRITER_SRCS = writer.cpp
-WRITER_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(WRITER_SRCS)))
-WRITER_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(WRITER_SRCS)))
-
-XMLBASE_SRCS = xmlbase.cpp
-XMLBASE_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(XMLBASE_SRCS)))
-XMLBASE_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(XMLBASE_SRCS)))
-
-######################################
-# High level rules
-all : pyx$(EXESUFFIX) simple_handler$(EXESUFFIX) writer$(EXESUFFIX) xmlbase$(EXESUFFIX)
-
-pyx$(EXESUFFIX) : $(PYX_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(PYX_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) pyx$(EXESUFFIX) ../../bin
-
-simple_handler$(EXESUFFIX) : $(SIMPLE_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(SIMPLE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) simple_handler$(EXESUFFIX) ../../bin
-
-writer$(EXESUFFIX) : $(WRITER_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(WRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) writer$(EXESUFFIX) ../../bin
-
-xmlbase$(EXESUFFIX) : $(XMLBASE_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(XMLBASE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) xmlbase$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) *.o \
-		core \
-		pyx$(EXESUFFIX) \
-		../../bin/pyx$(EXESUFFIX) \
-		writer$(EXESUFFIX) \
-		../../bin/writer$(EXESUFFIX) \
-		xmlbase$(EXESUFFIX) \
-		../../bin/xmlbase$(EXESUFFIX) \
-		simple_handler$(EXESUFFIX) \
-		../../bin/simple_handler$(EXESUFFIX)
-
-# End of File
--- a/examples/SAX/Makefile.am
+++ b/examples/SAX/Makefile.am
@ -0,0 +1,17 @@
+bin_PROGRAMS = pyx simple_handler writer xmlbase
+
+LIBARABICA = $(top_builddir)/src/libarabica.la
+
+pyx_SOURCES = pyx.cpp
+pyx_LDADD =  $(LIBARABICA)
+
+simple_handler_SOURCES = SimpleHandler.cpp SimpleHandler.h wrapper.cpp
+simple_handler_LDADD = $(LIBARABICA)
+
+writer_SOURCES = writer.cpp
+writer_LDADD = $(LIBARABICA)
+
+xmlbase_SOURCES = xmlbase.cpp
+xmlbase_LDADD = $(LIBARABICA)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
--- a/examples/SAX2DOM/Makefile
+++ b/examples/SAX2DOM/Makefile
@ -1,38 +0,0 @@
-
-include ../../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-DOMWRITER_SRCS = DOMWriter.cpp
-DOMWRITER_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(DOMWRITER_SRCS)))
-DOMWRITER_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(DOMWRITER_SRCS)))
-
-######################################
-# High level rules
-all : domwriter$(EXESUFFIX)
-
-domwriter$(EXESUFFIX) : $(DOMWRITER_OBJS)
-	$(LD) $(LDFLAGS)  -o $@ $(DOMWRITER_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) domwriter$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(DOMWRITER_OBJS) \
-		domwriter$(EXESUFFIX) \
-		 ../../bin/domwriter$(EXESUFFIX)
-
-# End of File
--- a/examples/Utils/Makefile
+++ b/examples/Utils/Makefile
@ -1,43 +0,0 @@
-
-include ../../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-TRANSCODE_SRCS = transcode.cpp
-TRANSCODE_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(TRANSCODE_SRCS)))
-TRANSCODE_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(TRANSCODE_SRCS)))
-
-######################################
-# High level rules
-all : transcode$(EXESUFFIX)
-
-transcode$(EXESUFFIX) : $(TRANSCODE_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(TRANSCODE_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) transcode$(EXESUFFIX) ../../bin
-
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-
-clean :
-	$(REMOVE) $(TRANSCODE_OBJS) \
-		transcode$(EXESUFFIX) \
-		../../bin/transcode$(EXESUFFIX)
-
-# End of File
-
-
-
--- a/examples/Utils/Makefile.am
+++ b/examples/Utils/Makefile.am
@ -0,0 +1,8 @@
+bin_PROGRAMS = transcode
+
+LIBARABICA = $(top_builddir)/src/libarabica.la
+
+transcode_SOURCES = transcode.cpp
+transcode_LDADD = $(LIBARABICA)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
--- a/examples/XPath/Makefile
+++ b/examples/XPath/Makefile
@ -1,38 +0,0 @@
-
-include ../../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-XGREP_SRCS = xgrep.cpp
-XGREP_HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(XGREP_SRCS)))
-XGREP_OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(XGREP_SRCS)))
-
-######################################
-# High level rules
-all : xgrep$(EXESUFFIX)
-
-xgrep$(EXESUFFIX) : $(XGREP_OBJS)
-	$(LD) $(LDFLAGS)  -o $@ $(XGREP_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) xgrep$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(XGREP_OBJS) \
-		xgrep$(EXESUFFIX) \
-		 ../../bin/xgrep$(EXESUFFIX)
-
-# End of File
--- a/examples/XPath/Makefile.am
+++ b/examples/XPath/Makefile.am
@ -0,0 +1,12 @@
+bin_PROGRAMS = xgrep 
+
+LIBARABICA = $(top_builddir)/src/libarabica.la
+
+xgrep_SOURCES = xgrep.cpp
+xgrep_LDADD = $(LIBARABICA)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
+
+jez:
+	echo @top_builddir@
+
--- a/include/DOM/DOM.vcproj
+++ b/include/DOM/DOM.vcproj
@ -1,298 +0,0 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.00"
-	Name="DOM"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\..\bin"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/Zm200 "
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				TreatWChar_tAsBuiltInType="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/DOM.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\..\bin\DOM.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="4"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/DOM.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile=".\Release\DOM.lib"
-				SuppressStartupBanner="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="DOM"
-			Filter="">
-			<File
-				RelativePath=".\Attr.h">
-			</File>
-			<File
-				RelativePath=".\CDATASection.h">
-			</File>
-			<File
-				RelativePath=".\CharacterData.h">
-			</File>
-			<File
-				RelativePath=".\Comment.h">
-			</File>
-			<File
-				RelativePath=".\DOMException.h">
-			</File>
-			<File
-				RelativePath=".\DOMImplementation.h">
-			</File>
-			<File
-				RelativePath=".\Document.h">
-			</File>
-			<File
-				RelativePath=".\DocumentFragment.h">
-			</File>
-			<File
-				RelativePath=".\DocumentType.h">
-			</File>
-			<File
-				RelativePath=".\Element.h">
-			</File>
-			<File
-				RelativePath=".\Entity.h">
-			</File>
-			<File
-				RelativePath=".\EntityReference.h">
-			</File>
-			<File
-				RelativePath=".\NamedNodeMap.h">
-			</File>
-			<File
-				RelativePath=".\Node.h">
-			</File>
-			<File
-				RelativePath=".\NodeList.h">
-			</File>
-			<File
-				RelativePath=".\Notation.h">
-			</File>
-			<File
-				RelativePath=".\ProcessingInstruction.h">
-			</File>
-			<File
-				RelativePath=".\Proxy.h">
-			</File>
-			<File
-				RelativePath=".\Text.h">
-			</File>
-			<Filter
-				Name="Traversal"
-				Filter="">
-				<File
-					RelativePath=".\Traversal\DocumentTraversal.h">
-				</File>
-				<File
-					RelativePath=".\Traversal\NodeFilter.h">
-				</File>
-				<File
-					RelativePath=".\Traversal\NodeIterator.h">
-				</File>
-				<File
-					RelativePath=".\Traversal\TreeWalker.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="Events"
-				Filter="">
-				<File
-					RelativePath=".\Events\DocumentEvent.h">
-				</File>
-				<File
-					RelativePath=".\Events\Event.h">
-				</File>
-				<File
-					RelativePath=".\Events\EventException.h">
-				</File>
-				<File
-					RelativePath=".\Events\EventListener.h">
-				</File>
-				<File
-					RelativePath=".\Events\EventTarget.h">
-				</File>
-				<File
-					RelativePath=".\Events\MutationEvent.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Implementations"
-			Filter="">
-			<Filter
-				Name="Simple"
-				Filter="">
-				<File
-					RelativePath=".\Simple\AttrImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\AttrMap.h">
-				</File>
-				<File
-					RelativePath=".\Simple\AttrNSImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\CDATASectionImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\CharacterDataImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\CommentImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\DOMImplementation.h">
-				</File>
-				<File
-					RelativePath=".\Simple\DocumentFragmentImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\DocumentImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\DocumentTypeImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\ElementByTagImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\ElementImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\ElementNSImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\EntityImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\EntityReferenceImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\Helpers.h">
-				</File>
-				<File
-					RelativePath=".\Simple\NamedNodeMapImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\NodeImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\NotationImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\ProcessingInstructionImpl.h">
-				</File>
-				<File
-					RelativePath=".\Simple\StringAdaptor.h">
-				</File>
-				<File
-					RelativePath=".\Simple\TextImpl.h">
-				</File>
-			</Filter>
-			<Filter
-				Name="SAX2DOM"
-				Filter="">
-				<File
-					RelativePath=".\SAX2DOM\DocumentTypeImpl.h">
-				</File>
-				<File
-					RelativePath=".\SAX2DOM\SAX2DOM.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Utils"
-			Filter="">
-			<File
-				RelativePath="Utils\Stream.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/include/SAX/ParserConfig.h
+++ b/include/SAX/ParserConfig.h
@ -0,0 +1,74 @@
+#ifndef ARABICA_PARSERCONFIG_H
+#define ARABICA_PARSERCONFIG_H
+
+#ifdef USE_LIBXML2
+#include <SAX/wrappers/saxlibxml2.h>
+#undef DEF_SAX_P
+#define DEF_SAX_P libxml2_wrapper
+#ifdef _MSC_VER
+#pragma message("Including libxml2")
+#pragma commentcomment(lib, "libxml2.lib")
+#endif
+#endif
+
+#ifdef USE_MSXML
+#ifndef _MSC_VER
+#error "Can only use MSXML on Windows"
+#endif
+#pragma message("Including MSXML")
+#include <SAX/wrappers/saxmsxml2.h>
+#undef DEF_SAX_P
+#define DEF_SAX_P msxml2_wrapper
+#endif 
+
+#ifdef USE_XERCES
+#include <SAX/wrappers/saxxerces.h>
+#undef DEF_SAX_P
+#define DEF_SAX_P xerces_wrapper
+#ifdef _MSC_VER
+#pragma message("Including Xerces")
+#pragma comment(lib, "xerces-c_2.lib")
+#endif
+#endif
+
+#ifdef USE_GARDEN
+#ifdef _MSC_VER
+#pragma message("Including Garden")
+#endif
+#include <SAX/parsers/saxgarden.h>
+#undef DEF_SAX_P
+#define DEF_SAX_P Garden
+#endif
+
+#ifdef USE_EXPAT
+#include <SAX/wrappers/saxexpat.h>
+#undef DEF_SAX_P
+#define DEF_SAX_P expat_wrapper
+#ifdef _MSC_VER
+#pragma message("Including Expat")
+#pragma comment(lib, "libexpat.lib")
+#endif
+#endif
+
+#ifdef _MSC_VER
+#pragma comment(lib, "wsock32.lib")
+#endif
+
+
+#ifndef NO_DEFAULT_PARSER
+#ifdef DEF_SAX_P
+namespace SAX
+{
+  template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
+  class XMLReader : public DEF_SAX_P<string_type, T0, T1> { };
+} // namespace SAX
+#else
+#error "No default parser defined."
+#endif
+#endif
+
+#undef DEF_P
+
+#endif 
+
+
--- a/323
+++ b/323
@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/ltmain.sh
+++ b/ltmain.sh
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@ -0,0 +1,162 @@
+
+AC_DEFUN([ARABICA_HAS_BOOST],
+[
+    AC_ARG_WITH([boost],
+                AS_HELP_STRING([--with-boost=DIR],
+                [use boost (default is NO) specify the root directory for boost library (optional)]),
+                [
+                if test "$withval" = "no"; then
+                            want_boost="no"
+                elif test "$withval" = "yes"; then
+                    want_boost="yes"
+                    ac_boost_path=""
+                else
+                                want_boost="yes"
+                        ac_boost_path="$withval"
+                        fi
+                ],
+                [want_boost="yes"])
+
+        if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+                boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
+                boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'`
+                boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
+                boost_lib_version_req_minor=`expr $boost_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
+                boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
+                if test "x$boost_lib_version_req_sub_minor" = "x" ; then
+                        boost_lib_version_req_sub_minor="0"
+        fi
+                WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+  $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
+                AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req)
+                succeeded=no
+
+                dnl first we check the system location for boost libraries
+                dnl this location ist chosen if boost libraries are installed with the --layout=system option
+                dnl or if you install boost with RPM
+                if test "$ac_boost_path" != ""; then
+                        BOOST_CPPFLAGS="-I$ac_boost_path"
+                else
+                        for ac_boost_path_tmp in /usr/include /usr/local/include /opt /opt/include ; do
+                                if test -d "$ac_boost_path_tmp/boost" && test -r "$ac_boost_path_tmp/boost"; then
+                                        BOOST_CPPFLAGS="-I$ac_boost_path_tmp"
+                                        break;
+                                fi
+                        done
+                fi
+
+                CPPFLAGS_SAVED="$CPPFLAGS"
+                CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+                export CPPFLAGS
+
+        AC_LANG_PUSH(C++)
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@%:@include <boost/version.hpp>
+]],
+       [[
+#if BOOST_VERSION >= $WANT_BOOST_VERSION
+// Everything is okay
+#else
+#  error Boost version is too old
+#endif
+
+                ]])],
+        [
+         AC_MSG_RESULT(yes)
+                 succeeded=yes
+                 found_system=yes
+         ifelse([$2], , :, [$2])
+       ],
+       [
+       ])
+       AC_LANG_POP([C++])
+                dnl if we found no boost with system layout we search for boost libraries
+                dnl built and installed without the --layout=system option or for a staged(not installed) version
+                if test "x$succeeded" != "xyes"; then
+                        _version=0
+                        if test "$ac_boost_path" != ""; then
+                BOOST_LDFLAGS="-L$ac_boost_path/lib"
+                                if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                                        for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                                                _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                                                V_CHECK=`expr $_version_tmp \> $_version`
+                                                if test "$V_CHECK" = "1" ; then
+                                                        _version=$_version_tmp
+                                                fi
+                                                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                                                BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
+                                        done
+                                fi
+                        else
+                                for ac_boost_path in /usr /usr/local /opt ; do
+                                        if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+                                                for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+                                                        _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+                                                        V_CHECK=`expr $_version_tmp \> $_version`
+                                                        if test "$V_CHECK" = "1" ; then
+                                                                _version=$_version_tmp
+                                                                best_path=$ac_boost_path
+                                                        fi
+                                                done
+                                        fi
+                                done
+
+                                VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+                                BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+
+                        if test "x$BOOST_ROOT" != "x"; then
+                    if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/lib" && test -r "$BOOST_ROOT/stage/lib"; then
+                                                version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
+                                                stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
+                                                stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'`
+                                                V_CHECK=`expr $stage_version_shorten \>\= $_version`
+                                                if test "$V_CHECK" = "1" ; then
+                                                        AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT)
+                                                        BOOST_CPPFLAGS="-I$BOOST_ROOT"
+                                                fi
+                                        fi
+                        fi
+                        fi
+
+                        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+                        export CPPFLAGS
+
+            AC_LANG_PUSH(C++)
+            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+@%:@include <boost/version.hpp>
+]],
+       [[
+#if BOOST_VERSION >= $WANT_BOOST_VERSION
+// Everything is okay
+#else
+#  error Boost version is too old
+#endif
+
+                ]])],
+        [
+         AC_MSG_RESULT(yes ($_version))
+                 succeeded=yes
+         ifelse([$2], , :, [$2])
+       ],
+       [
+         AC_MSG_RESULT(no ($_version))
+         ifelse([$3], , :, [$3])
+       ])
+        AC_LANG_POP([C++])
+                fi
+
+                if test "$succeeded" != "yes" ; then
+                        if test "$_version" = "0" ; then
+                                AC_MSG_ERROR([[Could not detect the boost libraries (version $boost_lib_version_req_shorten or higher).  If you do have boost installed, then check your version number looking in <boost/version.hpp>. ]])
+                        else
+                                AC_MSG_ERROR('Your boost libraries seems to old (version $_version).  We need at least $boost_lib_version_shorten')
+                        fi
+                else
+                        AC_SUBST(BOOST_CPPFLAGS)
+                        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
+                fi
+        CPPFLAGS="$CPPFLAGS_SAVED"
+        fi
+])
+
+
--- a/m4/expat.m4
+++ b/m4/expat.m4
@ -0,0 +1,44 @@
+AC_DEFUN([ARABICA_HAS_EXPAT],
+[ AC_ARG_WITH(expat,
+	      [  --with-expat=PREFIX     Use system expat library],
+	      , with_expat=yes)
+
+  AM_CONDITIONAL(EXPAT_INSTALLED, test $with_expat != no)
+
+  EXPAT_CFLAGS=
+  EXPAT_LIBS=
+  if test $with_expat != no; then
+    if test $with_expat != yes; then
+      expat_possible_path="$with_expat"
+    else
+      expat_possible_path="/usr /usr/local /opt /var" 
+    fi
+    AC_MSG_CHECKING([for expat headers])
+    expat_save_CXXFLAGS="$CXXFLAGS"
+    expat_found=no
+    for expat_path_tmp in $expat_possible_path ; do
+      CXXFLAGS="$CXXFLAGS -I$expat_path_tmp/include"
+      AC_COMPILE_IFELSE([AC_LANG_SOURCE(@%:@include <expat.h>)],
+                            [AS_VAR_SET(expat_found, yes)],
+                            [AS_VAR_SET(expat_found, no)])
+      if test $expat_found = yes; then
+        EXPAT_CFLAGS="-I$expat_path_tmp/include"
+        EXPAT_LIBS="-L$expat_path_tmp/lib"
+        break;
+      fi
+      CXXFLAGS="$expat_save_CXXFLAGS"
+    done                
+    CXXFLAGS="$expat_save_CXXFLAGS"
+    AC_MSG_RESULT($expat_found)
+    if test $expat_found = yes; then
+      AC_CHECK_LIB(expat, XML_ParserCreate,
+		     [ EXPAT_LIBS="$EXPAT_LIBS -lexpat"
+		       expat_found=yes ],
+		     [ expat_found=no ],
+		     "$EXPAT_LIBS")
+      if test $expat_found = yes; then
+        HAVE_EXPAT=1
+      fi
+    fi  
+  fi
+])
--- a/m4/has_codecvt.m4
+++ b/m4/has_codecvt.m4
@ -0,0 +1,14 @@
+AC_DEFUN([ARABICA_CHECK_CODECVT_SPECIALISATIONS],
+[
+  if test $wchar_t_available = yes; then
+    AC_MSG_CHECKING([for std::codecvt specialisations])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <codecvt>]],
+                             [[std::codecvt<char, wchar_t, std::mbstate_t> test;]])],
+                    [AS_VAR_SET(codecvt_available, yes)],
+                    [AS_VAR_SET(codecvt_available, no)])
+    AC_MSG_RESULT($codecvt_available)
+    if test $codecvt_available = yes; then
+      AC_DEFINE(ARABICA_NO_CODECVT_SPECIALISATIONS, [], [defined if we don't need extra codecvt template specialisations])
+    fi
+  fi
+])
--- a/m4/has_parser.m4
+++ b/m4/has_parser.m4
@ -0,0 +1,23 @@
+AC_DEFUN([ARABICA_HAS_XML_PARSER],
+[
+  if test "$HAVE_LIBXML2-$HAVE_EXPAT-$HAVE_XERCES" = "--"; then
+    AC_MSG_ERROR([[Cannot find an XML parser library.  Arabica needs one of Expat, LibXML2 or Xerces]])
+  fi
+
+  if test "$HAVE_EXPAT-" != "-"; then
+    AC_DEFINE(USE_EXPAT, ,[define to build against Expat])
+    PARSER_HEADERS=$EXPAT_CFLAGS
+    PARSER_LIBS=$EXPAT_LIBS
+  elif test "$HAVE_LIBXML2-" != "-"; then
+    AC_DEFINE(USE_LIBXML2, ,[define to build against LibXML2])
+    PARSER_HEADERS=$LIBXML2_CFLAGS
+    PARSER_LIBS=$LIBXML2_LIBS
+  elif test "$HAVE_XERCES-" != "-"; then
+    AC_DEFINE(USE_XERCES, ,[define to build against Xerces])
+    PARSER_HEADERS=$XERCES_CFLAGS
+    PARSER_LIBS=$XERCES_LIBS
+  fi
+
+  AC_SUBST(PARSER_HEADERS)
+  AC_SUBST(PARSER_LIBS)
+])
--- a/m4/has_std_wstring.m4
+++ b/m4/has_std_wstring.m4
@ -0,0 +1,12 @@
+AC_DEFUN([ARABICA_HAS_STD_WSTRING],
+[
+  AC_MSG_CHECKING([for std::wstring support])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <string>]],
+                                     [[std::wstring test;]])],
+                    [AS_VAR_SET(wchar_t_available, yes)],
+                    [AS_VAR_SET(wchar_t_available, no)])
+  AC_MSG_RESULT($wchar_t_available)
+  if test $wchar_t_available = no; then
+    AC_DEFINE(ARABICA_NO_WCHAR_T, ,[disables wchar_t])
+  fi
+])
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@ -0,0 +1,44 @@
+AC_DEFUN([ARABICA_HAS_LIBXML2],
+[ AC_ARG_WITH(libxml2,
+	      [  --with-libxml2=PREFIX     Use system libxml2 library],
+	      , with_libxml2=yes)
+
+  AM_CONDITIONAL(LIBXML2_INSTALLED, test $with_libxml2 != no)
+
+  LIBXML2_CFLAGS=
+  LIBXML2_LIBS=
+  if test $with_libxml2 != no; then
+    if test $with_libxml2 != yes; then
+      libxml2_possible_path="$with_libxml2"
+    else
+      libxml2_possible_path="/usr /usr/local /opt /var" 
+    fi
+    AC_MSG_CHECKING([for libxml2 headers])
+    libxml2_save_CXXFLAGS="$CXXFLAGS"
+    libxml2_found=no
+    for libxml2_path_tmp in $libxml2_possible_path ; do
+      CXXFLAGS="$CXXFLAGS -I$libxml2_path_tmp/include/libxml2"
+      AC_COMPILE_IFELSE([AC_LANG_SOURCE(@%:@include <libxml/parser.h>)],
+                            [AS_VAR_SET(libxml2_found, yes)],
+                            [AS_VAR_SET(libxml2_found, no)])
+      if test $libxml2_found = yes; then
+        LIBXML2_CFLAGS="-I$libxml2_path_tmp/include/libxml2"
+        LIBXML2_LIBS="-L$libxml2_path_tmp/lib"
+        break;
+      fi
+      CXXFLAGS="$libxml2_save_CXXFLAGS"
+    done                
+    CXXFLAGS="$libxml2_save_CXXFLAGS"
+    AC_MSG_RESULT($libxml2_found)
+    if test $libxml2_found = yes; then
+      AC_CHECK_LIB(xml2, xmlInitParser,
+		     [ LIBXML2_LIBS="$LIBXML2_LIBS -lxml2"
+		       libxml2_found=yes ],
+		     [ libxml2_found=no ],
+		     "$LIBXML2_LIBS")
+      if test $libxml2_found = yes; then
+        HAVE_LIBXML2=1
+      fi
+    fi  
+  fi
+])
--- a/m4/xerces.m4
+++ b/m4/xerces.m4
@ -0,0 +1,47 @@
+AC_DEFUN([ARABICA_HAS_XERCES],
+[ AC_ARG_WITH(xerces,
+	      [  --with-xerces=PREFIX     Use system xerces library],
+	      , with_xerces=yes)
+
+  AM_CONDITIONAL(XERCES_INSTALLED, test $with_xerces != no)
+
+  XERCES_CFLAGS=
+  XERCES_LIBS=
+  if test $with_xerces != no; then
+    if test $with_xerces != yes; then
+      xerces_possible_path="$with_xerces"
+    else
+      xerces_possible_path="/usr /usr/locale /opt /var" 
+    fi
+    AC_MSG_CHECKING([for Xerces headers])
+    xerces_save_CXXFLAGS="$CXXFLAGS"
+    xerces_found=no
+    for xerces_path_tmp in $xerces_possible_path ; do
+      CXXFLAGS="$CXXFLAGS -I$xerces_path_tmp/include"
+      AC_COMPILE_IFELSE([AC_LANG_SOURCE(@%:@include <xercesc/sax2/SAX2XMLReader.hpp>)],
+                            [AS_VAR_SET(xerces_found, yes)],
+                            [AS_VAR_SET(xerces_found, no)])
+      if test $xerces_found = yes; then
+        XERCES_CFLAGS="-I$xerces_path_tmp/include"
+        XERCES_LIBS="-L$xerces_path_tmp/lib"
+        break;
+      fi
+      CXXFLAGS="$xerces_save_CXXFLAGS"
+    done                
+    CXXFLAGS="$xerces_save_CXXFLAGS"
+    AC_MSG_RESULT($xerces_found)
+    if test $xerces_found = yes; then
+      AC_MSG_CHECKING([for XMLPlatformUtils::Initialize in -lxerces-c])
+      CXXFLAGS="$CXXFLAGS $XERCES_CFLAGS $XERCES_LIBS -lxerces-c"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <xercesc/util/PlatformUtils.hpp>]],
+                                     [[XERCES_CPP_NAMESPACE::XMLPlatformUtils::Initialize()]])],
+                     [AS_VAR_SET(xerces_found, yes)],
+                     [AS_VAR_SET(xerces_found, no)])
+      AC_MSG_RESULT($xerces_found)
+      if test $xerces_found = yes; then
+        HAVE_XERCES=1
+      fi
+      CXXFLAGS="$xerces_save_CXXFLAGS"
+    fi  
+  fi
+])
--- a/360
+++ b/360
@ -0,0 +1,360 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2005-06-08.21
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
--- a/src/Makefile
+++ b/src/Makefile
@ -1,85 +0,0 @@
-####################################
-# Arabica Makefile
-#
-# I wrote this for GNU Make + GNU tools on Linux.
-# You may have to jiggle it for your own environment.
-# Platforms specific build files gratefully received 
-# at jez@jezuk.co.uk  Thanks :)
-#
-# $Id$
-####################################
-
-include ../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-CXXFLAGS += -I../include
-LDFLAGS += $(LINK_SHARED)
-
-INC_DIRS +=
-LIBS_DIRS +=
-
-STATIC_LIBS +=
-DYNAMIC_LIBS +=
-
-######################################
-# SOURCE FILES
-SRCS =  saxlib.cpp \
-	SAX/helpers/InputSourceResolver.cpp \
-	Utils/rot13codecvt.cpp \
-	Utils/utf8ucs2codecvt.cpp \
-	Utils/impl/ucs2_utf8.cpp \
-	Utils/utf16beucs2codecvt.cpp \
-	Utils/utf16leucs2codecvt.cpp \
-	Utils/impl/ucs2_utf16.cpp \
-	Utils/iso88591utf8codecvt.cpp \
-	Utils/utf8iso88591codecvt.cpp \
-	Utils/impl/iso88591_utf8.cpp \
-	Utils/utf16utf8codecvt.cpp \
-	Utils/ucs2utf8codecvt.cpp \
-	Utils/base64codecvt.cpp \
-	XML/XMLCharacterClasses.cpp 
-
-HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
-OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
-
-##########################
-# High level rules
-all : libArabica$(LIBSUFFIX)
-
-libArabica$(LIBSUFFIX) : $(OBJS)
-	$(LD) $(LDFLAGS) -o libArabica$(LIBSUFFIX) $(OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) libArabica$(LIBSUFFIX) ../bin
-
-######################
-# Compile rules
-####
-# the .S files depends on symbols defined in this Makefile, hence
-# this slightly wacky rule
-saxlib.cpp : ../include/SAX/ParserConfig.h ../include/SAX/ArabicaConfig.h saxlib.S
-	$(CPP) $(PARSER_CONFIG) -o saxlib.cpp saxlib.S 
-
-../include/SAX/ParserConfig.h : Makefile ../Makefile.header ParserConfig.S
-	$(CPP) $(PARSER_CONFIG) -o ../include/SAX/ParserConfig.h ParserConfig.S
-
-../include/SAX/ArabicaConfig.h : Makefile ../Makefile.header ArabicaConfig.S
-	$(CPP) $(PARSER_CONFIG) -o ../include/SAX/ArabicaConfig.h ArabicaConfig.S
-
-%.cpp : ../include/SAX/ArabicaConfig.h ../include/SAX/ParserConfig.h
-
-Makefile :
-
-include ../Makefile.rules
-
-#############################################
-# Cleaning up
-clean :
-	$(REMOVE) wrappers/*.o $(OBJS) libArabica*  ../bin/libArabica* saxlib.cpp ../include/SAX/ParserConfig.h ../include/SAX/ArabicaConfig.h
-
-# End of File
-
-
-
-
-
-
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -0,0 +1,27 @@
+
+cc_sources = arabica.cpp \
+	SAX/helpers/InputSourceResolver.cpp \
+	Utils/base64codecvt.cpp \
+	Utils/impl/iso88591_utf8.cpp \
+	Utils/impl/ucs2_utf16.cpp \
+	Utils/impl/ucs2_utf8.cpp \
+	Utils/iso88591utf8codecvt.cpp \
+	Utils/rot13codecvt.cpp \
+	Utils/ucs2utf8codecvt.cpp \
+	Utils/utf16beucs2codecvt.cpp \
+	Utils/utf16leucs2codecvt.cpp \
+	Utils/utf16utf8codecvt.cpp \
+	Utils/utf8iso88591codecvt.cpp \
+	Utils/utf8ucs2codecvt.cpp \
+	XML/XMLCharacterClasses.cpp
+
+library_includedir=$(includedir)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
+
+lib_LTLIBRARIES = libarabica.la
+libarabica_la_SOURCES= $(cc_sources) 
+libarabica_la_LDFLAGS= $(PARSER_LIBS)
+
+
+
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@ -1,75 +0,0 @@
-####################################
-# Arabica Makefile
-#
-# Modified for GCC 3.4.2 (MinGW)
-####################################
-
-include ../Makefile.header
-
-######################################
-# ADDITIONAL BUILD FLAGS
-CXXFLAGS += -D__GNUWIN32__ -D_LIB 
-LDFLAGS += $(LINK_SHARED) -Wl,--out-implib,../../../../Dev/lib/libArabica.a
-
-INCS_DIRS += -I..
-LIBS_DIRS +=
-
-STATIC_LIBS +=
-DYNAMIC_LIBS +=
-
-######################################
-# SOURCE FILES
-SRCS =  saxlib.cpp \
-	helpers/InputSourceResolver.cpp \
-	../Utils/rot13codecvt.cpp \
-	../Utils/utf8ucs2codecvt.cpp \
-	../Utils/impl/ucs2_utf8.cpp \
-	../Utils/utf16beucs2codecvt.cpp \
-	../Utils/utf16leucs2codecvt.cpp \
-	../Utils/impl/ucs2_utf16.cpp \
-	../Utils/iso88591utf8codecvt.cpp \
-	../Utils/utf8iso88591codecvt.cpp \
-	../Utils/impl/iso88591_utf8.cpp \
-	../Utils/utf16utf8codecvt.cpp \
-	../Utils/ucs2utf8codecvt.cpp \
-	../Utils/base64codecvt.cpp \
-	../Utils/impl/codecvt_specialisations.cpp \
-	../XML/XMLCharacterClasses.cpp 
-
-HDRS = $(patsubst %.c,%.h,$(patsubst %.cpp,%.h,$(SRCS)))
-OBJS = $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(SRCS)))
-
-##########################
-# High level rules
-all : libArabica$(LIBSUFFIX)
-
-libArabica$(LIBSUFFIX) : $(OBJS)
-	$(LD) $(LDFLAGS) -o ../bin/libArabica$(LIBSUFFIX) $(OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-
-######################
-# Compile rules
-####
-# the .S files depends on symbols defined in this Makefile, hence
-# this slightly wacky rule
-saxlib.cpp : ParserConfig.h ArabicaConfig.h
-	$(CPP) $(PARSER_CONFIG) -o saxlib.cpp saxlib.S 
-
-ParserConfig.h : Makefile ../Makefile.header
-	$(CPP) $(PARSER_CONFIG) -o ParserConfig.h ParserConfig.S
-
-ArabicaConfig.h : Makefile ../Makefile.header
-	$(CPP) $(PARSER_CONFIG) -o ArabicaConfig.h ArabicaConfig.S
-
-%.cpp : ArabicaConfig.h ParserConfig.h
-
-Makefile :
-
-include ../Makefile.rules
-
-#############################################
-# Cleaning up
-clean :
-	$(REMOVE) wrappers/*.o $(OBJS) ../bin/libArabica* ../../../../Dev/lib/libArabica* saxlib.cpp ParserConfig.h ArabicaConfig.h
-
-# End of File
-
--- a/src/ParserConfig.S
+++ b/src/ParserConfig.S
@ -1,92 +0,0 @@
-#define pasty(m, n) m##n
-#define include pasty(#, include)
-#define ifdef pasty(#, ifdef)
-#define ifndef pasty(#, ifndef)
-#define endif pasty(#, endif)
-#define define pasty(#, define)
-#define message pasty(#, pragma message)
-#define undef pasty(#, undef)
-#define error pasty(#, error)
-#define else pasty(#, else)
-#define comment pasty(#, pragma comment)
-
-
-ifndef ARABICA_PARSERCONFIG_H
-define ARABICA_PARSERCONFIG_H
-
-#ifdef USE_LIBXML2
-include <SAX/wrappers/saxlibxml2.h>
-undef DEF_SAX_P
-define DEF_SAX_P libxml2_wrapper
-#ifdef _MSC_VER
-message("Including libxml2")
-comment(lib, "libxml2.lib")
-#endif
-#endif
-#ifdef USE_MSXML
-#ifndef _MSC_VER
-error "Can only use MSXML on Windows"
-#endif
-message("Including MSXML")
-include <SAX/wrappers/saxmsxml2.h>
-undef DEF_SAX_P
-define DEF_SAX_P msxml2_wrapper
-#endif 
-#ifdef USE_XERCES1
-include <SAX/wrappers/saxxerces.h>
-undef DEF_SAX_P
-define DEF_SAX_P xerces_wrapper
-#ifdef _MSC_VER
-message("Including Xerces 1")
-comment(lib, "xerces-c_1.lib")
-#endif
-#endif
-#ifdef USE_XERCES
-include <SAX/wrappers/saxxerces.h>
-undef DEF_SAX_P
-define DEF_SAX_P xerces_wrapper
-#ifdef _MSC_VER
-message("Including Xerces")
-comment(lib, "xerces-c_2.lib")
-#endif
-#endif
-#ifdef USE_GARDEN
-#ifdef _MSC_VER
-message("Including Garden")
-#endif
-include <SAX/parsers/saxgarden.h>
-undef DEF_SAX_P
-define DEF_SAX_P Garden
-#endif
-#ifdef USE_EXPAT
-include <SAX/wrappers/saxexpat.h>
-undef DEF_SAX_P
-define DEF_SAX_P expat_wrapper
-#ifdef _MSC_VER
-message("Including Expat")
-comment(lib, "libexpat.lib")
-#endif
-#endif
-
-#ifdef _MSC_VER
-comment(lib, "wsock32.lib")
-#endif
-
-
-ifndef NO_DEFAULT_PARSER
-ifdef DEF_SAX_P
-namespace SAX
-{
-  template<class string_type, class T0 = Arabica::nil_t, class T1 = Arabica::nil_t>
-  class XMLReader : public DEF_SAX_P<string_type, T0, T1> { };
-} // namespace SAX
-else
-error "No default parser defined."
-endif
-endif
-
-undef DEF_P
-
-endif 
-
-
--- a/src/arabica.cpp
+++ b/src/arabica.cpp
@ -0,0 +1,59 @@
+
+#ifdef _MSC_VER
+// turn off the useless "template name is too long" warning
+#pragma warning(disable: 4786)
+#endif
+
+#include <SAX/ArabicaConfig.h>
+
+#ifdef USE_EXPAT
+#include "SAX/wrappers/saxexpat.cpp"
+#ifdef _MSC_VER
+#pragma message("Pulling in Expat wrappers")
+#endif
+#endif
+
+#ifdef USE_LIBXML2
+#include "SAX/wrappers/saxlibxml2.cpp"
+#ifdef _MSC_VER
+#pragma message("Pulling in libxml2 wrappers")
+#endif
+#endif
+
+#ifdef USE_XERCES
+#include "SAX/wrappers/saxxerces.cpp"
+#ifdef _MSC_VER
+#pragma message("Pulling in Xerces wrappers")
+#endif
+#endif
+
+#ifdef USE_MSXML
+#ifdef _MSC_VER
+#pragma message("Using MSXML")
+#else
+#error "USE_MSXML is only valid for Visual Studio builds"
+#endif
+#endif
+
+#ifdef USE_GARDEN
+#ifdef _MSC_VER
+#pragma message("Using Garden")
+#endif
+#endif
+
+#ifndef ARABICA_NO_CODECVT_SPECIALISATIONS
+#include "Utils/impl/codecvt_specialisations.cpp"
+#endif 
+
+#ifdef __GNUWIN32__
+#ifdef _LIB
+#include <windows.h>
+
+BOOL APIENTRY DllMain(HINSTANCE hInst,
+                      DWORD reason,
+		      LPVOID reserved)
+{
+  return TRUE;
+}
+#endif
+#endif
--- a/src/saxlib.S
+++ b/src/saxlib.S
@ -1,90 +0,0 @@
-#define pasty(m, n) m##n
-#define include pasty(#, include)
-#define ifdef pasty(#, ifdef)
-#define ifndef pasty(#, ifndef)
-#define endif pasty(#, endif)
-#define define pasty(#, define)
-#define message pasty(#, pragma message)
-#define undef pasty(#, undef)
-#define error pasty(#, error)
-#define else pasty(#, else)
-#define comment pasty(#, pragma comment)
-
-#ifdef _MSC_VER
-// turn off the useless "template name is too long" warning
-#pragma warning(disable: 4786)
-#endif 
-
-include <SAX/ArabicaConfig.h>
-
-define NO_DEFAULT_PARSER
-include <SAX/XMLReader.h>
-
-#ifdef USE_LIBXML2
-include "SAX/wrappers/saxlibxml2.cpp"
-#ifdef _MSC_VER
-message("Pulling in libxml2 wrappers.")
-#endif
-#endif
-
-#ifdef USE_MSXML
-#ifndef _MSC_VER
-error "USE_MSXML is only valid for VisualC++ builds"
-#else
-message("Nothing to pull in for MSXML.")
-#endif
-#endif 
-
-#ifdef USE_XERCES
-include "SAX/wrappers/saxxerces.cpp"
-#ifdef _MSC_VER
-message("Pulling in Xerces wrappers.")
-#endif
-#endif
-
-#ifdef USE_GARDEN
-#ifdef _MSC_VER
-message("Nothing to pull in for Garden.")
-#endif
-#endif
-
-#ifdef USE_EXPAT
-include "SAX/wrappers/saxexpat.cpp"
-#ifdef _MSC_VER
-message("Pulling in Expat wrappers.")
-#endif	
-#endif
-
-ifndef ARABICA_NO_CODECVT_SPECIALISATIONS
-include "Utils/impl/codecvt_specialisations.cpp"
-endif
-
-#ifdef __GNUWIN32__
-#ifdef _LIB
-include <windows.h>
-
-BOOL APIENTRY DllMain(
-    HINSTANCE hInst
-  , DWORD reason
-  , LPVOID reserved
-)
-{
-    switch (reason)
-    {
-      case DLL_PROCESS_ATTACH:
-        break;
-
-      case DLL_PROCESS_DETACH:
-        break;
-
-      case DLL_THREAD_ATTACH:
-        break;
-
-      case DLL_THREAD_DETACH:
-        break;
-    }
-
-    return TRUE;
-}
-#endif
-#endif
--- a/test/CppUnit/framework/extensions/Orthodox.h
+++ b/test/CppUnit/framework/extensions/Orthodox.h
@ -1,93 +0,0 @@
-
-#ifndef CPPUNIT_ORTHODOX_H
-#define CPPUNIT_ORTHODOX_H
-
-#ifndef CPPUNIT_TESTCASE_H
-#include "TestCase.h"
-#endif
-
-/*
- * Orthodox performs a simple set of tests on an arbitary
- * class to make sure that it supports at least the
- * following operations:
- *
- *      default construction    - constructor
- *      equality/inequality     - operator== && operator!=
- *      assignment              - operator=
- *      negation                - operator!
- *      safe passage            - copy construction
- *
- * If operations for each of these are not declared
- * the template will not instantiate.  If it does 
- * instantiate, tests are performed to make sure
- * that the operations have correct semantics.
- *      
- * Adding an orthodox test to a suite is very 
- * easy: 
- * 
- * public: Test *suite ()  {
- *     TestSuite *suiteOfTests = new TestSuite;
- *     suiteOfTests->addTest (new ComplexNumberTest ("testAdd");
- *     suiteOfTests->addTest (new TestCaller<Orthodox<Complex> > ());
- *     return suiteOfTests;
- *  }
- *
- * Templated test cases be very useful when you are want to
- * make sure that a group of classes have the same form.
- *
- * see TestSuite
- */
-
-
-template <class ClassUnderTest> class Orthodox : public TestCase
-{
-public:
-                    Orthodox () : TestCase ("Orthodox") {}
-
-protected:
-    ClassUnderTest  call (ClassUnderTest object);
-    void            runTest ();
-
-
-};
-
-
-// Run an orthodoxy test
-template <class ClassUnderTest> void Orthodox<ClassUnderTest>::runTest ()
-{
-    // make sure we have a default constructor
-    ClassUnderTest   a, b, c;
-
-    // make sure we have an equality operator
-    assert (a == b);
-
-    // check the inverse
-    b.operator= (a.operator! ());
-    assert (a != b);
-
-    // double inversion
-    b = !!a;
-    assert (a == b);
-
-    // invert again
-    b = !a;
-
-    // check calls
-    c = a;
-    assert (c == call (a));
-
-    c = b;
-    assert (c == call (b));
-
-}
-
-
-// Exercise a call
-template <class ClassUnderTest> ClassUnderTest Orthodox<ClassUnderTest>::call (ClassUnderTest object)
-{
-    return object;
-}
-
-
-
-#endif
--- a/test/CppUnit/framework/extensions/RepeatedTest.h
+++ b/test/CppUnit/framework/extensions/RepeatedTest.h
@ -1,62 +0,0 @@
-
-#ifndef CPPUNIT_REPEATEDTEST_H
-#define CPPUNIT_REPEATEDTEST_H
-
-#ifndef CPPUNIT_GUARDS_H
-#include "Guards.h"
-#endif
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#include "TestDecorator.h"
-#endif
-
-class Test;
-class TestResult;
-
-
-/*
- * A decorator that runs a test repeatedly.
- * Does not assume ownership of the test it decorates
- *
- */
-
-class RepeatedTest : public TestDecorator 
-{
-    REFERENCEOBJECT (RepeatedTest)
-
-public:
-                        RepeatedTest (Test *test, int timesRepeat)
-                            : TestDecorator (test), m_timesRepeat (timesRepeat) {}
-
-    int                 countTestCases ();
-    std::string         toString ();
-    void                run (TestResult *result);
-
-private:
-    const int           m_timesRepeat;
-
-
-};
-
-
-// Counts the number of test cases that will be run by this test.
-inline RepeatedTest::countTestCases ()
-{ return TestDecorator::countTestCases () * m_timesRepeat; }
-
-// Returns the name of the test instance. 
-inline std::string RepeatedTest::toString ()
-{ return TestDecorator::toString () + " (repeated)"; }
-
-// Runs a repeated test
-inline void RepeatedTest::run (TestResult *result)
-{
-    for (int n = 0; n < m_timesRepeat; n++) {
-        if (result->shouldStop ())
-            break;
-
-        TestDecorator::run (result);
-    }
-}
-
-
-#endif
--- a/test/CppUnit/framework/extensions/TestDecorator.h
+++ b/test/CppUnit/framework/extensions/TestDecorator.h
@ -1,63 +0,0 @@
-
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#define CPPUNIT_TESTDECORATOR_H
-
-#ifndef CPPUNIT_GUARDS_H
-#include "Guards.h"
-#endif
-
-#ifndef CPPUNIT_TEST_H
-#include "Test.h"
-#endif
-
-class TestResult;
-
-/*
- * A Decorator for Tests
- *
- * Does not assume ownership of the test it decorates
- *
- */ 
-
-class TestDecorator : public Test 
-{
-    REFERENCEOBJECT (TestDecorator)
-
-public:
-                TestDecorator   (Test *test);
-                ~TestDecorator  ();
-
-    int         countTestCases  ();
-    void        run             (TestResult *result);
-    std::string toString        ();
-
-protected:
-    Test        *m_test;
-
-
-};
-
-
-inline TestDecorator::TestDecorator (Test *test)
-{ m_test = test; }
-
-
-inline TestDecorator::~TestDecorator ()
-{}
-
-
-inline TestDecorator::countTestCases ()
-{ return m_test->countTestCases (); }
-
-
-inline void TestDecorator::run (TestResult *result)
-{ m_test->run (result); }
-
-
-inline std::string TestDecorator::toString ()
-{ return m_test->toString (); }
-
-
-#endif
-
--- a/test/CppUnit/framework/extensions/TestSetup.h
+++ b/test/CppUnit/framework/extensions/TestSetup.h
@ -1,36 +0,0 @@
-
-#ifndef CPP_UINT_TESTSETUP_H
-#define CPP_UINT_TESTSETUP_H
-
-#ifndef CPPUNIT_GUARDS_H
-#include "Guards.h"
-#endif
-
-#ifndef CPPUNIT_TESTDECORATOR_H
-#include "TestDecorator.h"
-#endif
-
-class Test;
-class TestResult;
-
-
-class TestSetup : public TestDecorator 
-{
-    REFERENCEOBJECT (TestSetup)
-
-public:
-                    TestSetup (Test *test) : TestDecorator (test) {}
-                    run (TestResult *result);
-
-protected:
-    void            setUp () {}
-    void            tearDown () {}
-
-};
-
-
-inline TestSetup::run (TestResult *result)
-{ setUp (); TestDecorator::run (result); tearDown (); }
-
-#endif
-
--- a/test/CppUnit/textui/TestRunner.cpp
+++ b/test/CppUnit/textui/TestRunner.cpp
@ -1,146 +0,0 @@
-
-
-/*
- * A command line based tool to run tests.
- * TestRunner expects as its only argument the name of a TestCase class.
- * TestRunner prints out a trace as the tests are executed followed by a
- * summary at the end.
- *
- * You can add to the tests that the TestRunner knows about by 
- * making additional calls to "addTest (...)" in main.
- *
- * Here is the synopsis:
- *
- * TestRunner [-wait] ExampleTestCase
- *
- */
-
-#include <iostream>
-#include <vector>
-
-#include "TextTestResult.h"
-#include "../framework/Test.h"
-//#include "ExampleTestCase.h"
-
-
-using namespace std;
-
-typedef pair<string, Test *>           mapping;
-typedef vector<pair<string, Test *> >   mappings;
-
-class TestRunner
-{
-protected:
-    bool                                m_wait;
-    vector<pair<string,Test *> >        m_mappings;
-
-public:
-	            TestRunner    () : m_wait (false) {}
-                ~TestRunner   ();
-
-    void        run           (int ac, char **av);
-    void        addTest       (string name, Test *test)
-    { m_mappings.push_back (mapping (name, test)); }
-
-protected:
-    void        run (Test *test);
-    void        printBanner ();
-
-};
-
-
-
-void TestRunner::printBanner ()
-{
-    cout << "Usage: driver [ -wait ] testName, where name is the name of a test case class" << endl;
-}
-
-
-void TestRunner::run (int ac, char **av)
-{
-    string  testCase;
-    int     numberOfTests = 0;
-
-    for (int i = 1; i < ac; i++) {
-
-        if (string (av [i]) == "-wait") {
-            m_wait = true;
-            continue;
-        }
-
-        testCase = av [i];
-
-        if (testCase == "") {
-            printBanner ();
-            return;
-        }
-
-        Test *testToRun = NULL;
-
-        for (mappings::iterator it = m_mappings.begin ();
-                it != m_mappings.end ();
-                ++it) {
-            if ((*it).first == testCase) {
-                testToRun = (*it).second;
-                run (testToRun);
-
-            }
-        }
-
-        numberOfTests++;
-
-        if (!testToRun) {
-            cout << "Test " << testCase << " not found." << endl;
-            return;
-
-        } 
-
-
-    }
-
-    if (numberOfTests == 0) {
-        printBanner ();
-        return;        
-    }
-
-    if (m_wait) {
-        cout << "<RETURN> to continue" << endl;
-        cin.get ();
-
-    }
-
-
-}
-
-
-TestRunner::~TestRunner ()
-{
-    for (mappings::iterator it = m_mappings.begin ();
-             it != m_mappings.end ();
-             ++it)
-        delete it->second;
-
-}
-
-
-void TestRunner::run (Test *test)
-{
-    TextTestResult  result;
-
-    test->run (&result);
-
-    cout << result << endl;
-}
-
-/*
-int main (int ac, char **av)
-{
-    TestRunner runner;
-
-    runner.addTest ("ExampleTestCase", ExampleTestCase::suite ());
-    runner.run (ac, av);
-
-    return 0;
-}
-
-*/
--- a/test/DOM/Makefile
+++ b/test/DOM/Makefile
@ -1,52 +0,0 @@
-
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-DOMTEST_SRCS = main.cpp
-DOMTEST_OBJS = $(patsubst %.cpp,%.o,$(DOMTEST_SRCS))
-DOMTEST_TESTS = dom_test_suite.hpp \
-                test_Attribute.h \
-                test_CDATA.hpp \
-                test_CharacterData.hpp \
-                test_DOMImplementation.h \
-                test_Document.h \
-                test_DocumentFragment.h \
-                test_DocumentType.h \
-                test_Element.h \
-                test_ProcessingInstruction.h \
-                test_Siblings.h \
-                test_Text.hpp
-
-######################################
-# High level rules
-all : dom_test$(EXESUFFIX) 
-
-dom_test$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS) 
-	$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) dom_test$(EXESUFFIX) ../../bin
-
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(DOMTEST_OBJS) \
-		dom_test$(EXESUFFIX) \
-		../../bin/dom_test$(EXESUFFIX) 
-
-# End of File
--- a/test/DOM/Makefile.am
+++ b/test/DOM/Makefile.am
@ -0,0 +1,51 @@
+
+bin_PROGRAMS = dom_test dom_test_silly dom_test_wide
+
+LIBARABICA =  $(top_builddir)/src/libarabica.la
+
+cppunit_sources = ../CppUnit/framework/CppUnitException.h \
+                   ../CppUnit/framework/estring.h \
+                   ../CppUnit/framework/Guards.h \
+                   ../CppUnit/framework/Test.h \
+                   ../CppUnit/framework/TestCaller.h \
+                   ../CppUnit/framework/TestCase.cpp \
+                   ../CppUnit/framework/TestCase.h \
+                   ../CppUnit/framework/TestFailure.cpp \
+                   ../CppUnit/framework/TestFailure.h \
+                   ../CppUnit/framework/TestResult.cpp \
+                   ../CppUnit/framework/TestResult.h \
+                   ../CppUnit/framework/TestSuite.cpp \
+                   ../CppUnit/framework/TestSuite.h \
+                   ../CppUnit/TestRunner.cpp \
+                   ../CppUnit/TestRunner.hpp \
+                   ../CppUnit/textui/TextTestResult.cpp \
+                   ../CppUnit/textui/TextTestResult.h
+
+test_sources = dom_test_suite.hpp \
+                   test_Attribute.h \
+                   test_CDATA.hpp \
+                   test_CharacterData.hpp \
+                   test_DOMImplementation.h \
+                   test_Document.h \
+                   test_DocumentFragment.h \
+                   test_DocumentType.h \
+                   test_Element.h \
+                   test_ProcessingInstruction.h \
+                   test_Siblings.h \
+                   test_Text.hpp 
+
+dom_test_SOURCES = main.cpp $(cppunit_sources) $(test_sources)
+dom_test_DEPENDENCES = $(LIBARABICA)
+dom_test_LDADD =  $(LIBARABICA)
+
+dom_test_silly_SOURCES = main_silly.cpp $(cppunit_sources) $(test_sources) ../silly_string/silly_string.cpp ../silly_string/silly_string.hpp
+dom_test_silly_DEPENDENCES = $(LIBARABICA)
+dom_test_silly_LDADD =  $(LIBARABICA)
+
+dom_test_wide_SOURCES = main_wide.cpp $(cppunit_sources) $(test_sources) 
+dom_test_wide_DEPENDENCES = $(LIBARABICA)
+dom_test_wide_LDADD =  $(LIBARABICA)
+
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
+
--- a/test/DOM/main_silly.cpp
+++ b/test/DOM/main_silly.cpp
@ -1,12 +1,11 @@
+
 #ifdef _MSC_VER
 #pragma warning(disable: 4786 4250 4503)
 #endif

-#include "../DOM/dom_test_suite.hpp"
+#include "dom_test_suite.hpp"
 #include "../silly_string/silly_string.hpp"

-//template<> class Arabica::default_string_adaptor<silly_string> : public silly_string_adaptor { };
-
 ////////////////////////////////////////////////
 int main(int argc, const char* argv[])
 {
--- a/test/DOM/main_wide.cpp
+++ b/test/DOM/main_wide.cpp
--- a/test/DOM_silly/Makefile
+++ b/test/DOM_silly/Makefile
@ -1,52 +0,0 @@
-
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-DOMTEST_SRCS = main.cpp ../silly_string/silly_string.cpp
-DOMTEST_OBJS = $(patsubst %.cpp,%.o,$(DOMTEST_SRCS))
-DOMTEST_TESTS = ..\DOM\dom_test_suite.hpp \
-                ..\DOM\test_Attribute.h \
-                ..\DOM\test_CDATA.hpp \
-                ..\DOM\test_CharacterData.hpp \
-                ..\DOM\test_DOMImplementation.h \
-                ..\DOM\test_Document.h \
-                ..\DOM\test_DocumentFragment.h \
-                ..\DOM\test_DocumentType.h \
-                ..\DOM\test_Element.h \
-                ..\DOM\test_ProcessingInstruction.h \
-                ..\DOM\test_Siblings.h \
-                ..\DOM\test_Text.hpp
-
-######################################
-# High level rules
-all : dom_test_ss$(EXESUFFIX)
-
-dom_test_ss$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS) 
-	$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) dom_test_ss$(EXESUFFIX) ../../bin
-
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(DOMTEST_OBJS) \
-		dom_test_ss$(EXESUFFIX) \
-		../../bin/dom_test_ss$(EXESUFFIX) 
-
-# End of File
--- a/test/DOM_wide/Makefile
+++ b/test/DOM_wide/Makefile
@ -1,52 +0,0 @@
-
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-DOMTEST_SRCS = main.cpp
-DOMTEST_OBJS = $(patsubst %.cpp,%.o,$(DOMTEST_SRCS))
-DOMTEST_TESTS = ..\DOM\dom_test_suite.hpp \
-                ..\DOM\test_Attribute.h \
-                ..\DOM\test_CDATA.hpp \
-                ..\DOM\test_CharacterData.hpp \
-                ..\DOM\test_DOMImplementation.h \
-                ..\DOM\test_Document.h \
-                ..\DOM\test_DocumentFragment.h \
-                ..\DOM\test_DocumentType.h \
-                ..\DOM\test_Element.h \
-                ..\DOM\test_ProcessingInstruction.h \
-                ..\DOM\test_Siblings.h \
-                ..\DOM\test_Text.hpp
-
-######################################
-# High level rules
-all : dom_test_wide$(EXESUFFIX)
-
-dom_test_wide$(EXESUFFIX) : $(DOMTEST_OBJS) $(CPPUNIT_OBJS) 
-	$(LD) $(LDFLAGS) -o $@ $(DOMTEST_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) dom_test_wide$(EXESUFFIX) ../../bin
-
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(DOMTEST_OBJS) \
-		dom_test_wide$(EXESUFFIX) \
-		../../bin/dom_test_wide$(EXESUFFIX) 
-
-# End of File
--- a/test/Makefile
+++ b/test/Makefile
@ -1,20 +0,0 @@
-include Makefile.header
-
-all: 
-	cd DOM; ${MAKE}
-	cd DOM_wide; ${MAKE}
-	cd DOM_silly; ${MAKE}
-	cd SAX2DOM; ${MAKE}
-	cd XPath; ${MAKE}
-	cd XPath_wide; ${MAKE}
-	cd XPath_silly; ${MAKE}
-
-clean:
-	cd DOM; ${MAKE} clean
-	cd DOM_wide; ${MAKE} clean
-	cd DOM_silly; ${MAKE} clean
-	cd SAX2DOM; ${MAKE} clean
-	cd XPath; ${MAKE} clean
-	cd XPath_wide; ${MAKE} clean
-	cd XPath_silly; ${MAKE} clean
-
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -0,0 +1,4 @@
+SUBDIRS = DOM SAX2DOM XPath
+
+install:
+	echo "Nothing to install here"
--- a/test/SAX2DOM/Makefile
+++ b/test/SAX2DOM/Makefile
@ -1,41 +0,0 @@
-
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-SAXDOM_SRCS = main.cpp ../silly_string/silly_string.cpp
-SAXDOM_HDRS = $(patsubst %.cpp,%.h,$(SAXDOM_SRCS))
-SAXDOM_OBJS = $(patsubst %.cpp,%.o,$(SAXDOM_SRCS))
-
-######################################
-# High level rules
-all : sax2dom_test$(EXESUFFIX)
-
-sax2dom_test$(EXESUFFIX) : $(SAXDOM_OBJS) $(CPPUNIT_OBJS) 
-	$(LD) $(LDFLAGS) -o $@ $(SAXDOM_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) sax2dom_test$(EXESUFFIX) ../../bin
-
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(SAXDOM_OBJS) \
-		sax2dom_test$(EXESUFFIX) \
-		 ../../bin/sax2dom_test$(EXESUFFIX) 
-
-# End of File
--- a/test/SAX2DOM/Makefile.am
+++ b/test/SAX2DOM/Makefile.am
@ -0,0 +1,32 @@
+
+bin_PROGRAMS = sax2dom_test
+
+LIBARABICA =  $(top_builddir)/src/libarabica.la
+
+cppunit_sources = ../CppUnit/framework/CppUnitException.h \
+                   ../CppUnit/framework/estring.h \
+                   ../CppUnit/framework/Guards.h \
+                   ../CppUnit/framework/Test.h \
+                   ../CppUnit/framework/TestCaller.h \
+                   ../CppUnit/framework/TestCase.cpp \
+                   ../CppUnit/framework/TestCase.h \
+                   ../CppUnit/framework/TestFailure.cpp \
+                   ../CppUnit/framework/TestFailure.h \
+                   ../CppUnit/framework/TestResult.cpp \
+                   ../CppUnit/framework/TestResult.h \
+                   ../CppUnit/framework/TestSuite.cpp \
+                   ../CppUnit/framework/TestSuite.h \
+                   ../CppUnit/TestRunner.cpp \
+                   ../CppUnit/TestRunner.hpp \
+                   ../CppUnit/textui/TextTestResult.cpp \
+                   ../CppUnit/textui/TextTestResult.h
+
+
+test_sources = test_SAX.h
+
+sax2dom_test_SOURCES = main.cpp $(cppunit_sources) $(test_sources) ../silly_string/silly_string.cpp ../silly_string/silly_string.hpp
+sax2dom_test_DEPENDENCES = $(LIBARABICA)
+sax2dom_test_LDADD =  $(LIBARABICA)
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
+
--- a/test/SAX2DOM/main.cpp
+++ b/test/SAX2DOM/main.cpp
@ -25,6 +25,8 @@ int main(int argc, const char* argv[])
  runner.addTest("SAX2DOMTest_silly", SAXTest_suite<silly_string, silly_string_adaptor>());
 #ifndef ARABICA_NO_WCHAR_T
  runner.addTest("SAX2DOMTest_wide", SAXTest_suite<std::wstring, Arabica::default_string_adaptor<std::wstring> >());
+#else
+  std::cout << "No wchar_t tests on this platform :)" << std::endl;
 #endif
  runner.run(argc, argv);

--- a/test/XPath/Makefile
+++ b/test/XPath/Makefile
@ -1,39 +0,0 @@
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-XPATH_SRCS = main.cpp 
-XPATH_TESTS = arithmetic_test.hpp axis_enumerator_test.hpp execute_test.hpp logical_test.hpp node_test_test.hpp parse_test.hpp relational_test.hpp step_test.hpp value_test.hpp
-XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
-
-######################################
-# High level rules
-all : xpath_test$(EXESUFFIX)
-
-xpath_test$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
-	$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) xpath_test$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(XPATH_OBJS) \
-		xpath_test$(EXESUFFIX) \
-		 ../../bin/xpath_test$(EXESUFFIX) 
-
-
--- a/test/XPath/Makefile.am
+++ b/test/XPath/Makefile.am
@ -0,0 +1,53 @@
+
+bin_PROGRAMS = xpath_test xpath_test_silly xpath_test_wide
+
+LIBARABICA =  $(top_builddir)/src/libarabica.la
+
+cppunit_sources = ../CppUnit/framework/CppUnitException.h \
+                   ../CppUnit/framework/estring.h \
+                   ../CppUnit/framework/Guards.h \
+                   ../CppUnit/framework/Test.h \
+                   ../CppUnit/framework/TestCaller.h \
+                   ../CppUnit/framework/TestCase.cpp \
+                   ../CppUnit/framework/TestCase.h \
+                   ../CppUnit/framework/TestFailure.cpp \
+                   ../CppUnit/framework/TestFailure.h \
+                   ../CppUnit/framework/TestResult.cpp \
+                   ../CppUnit/framework/TestResult.h \
+                   ../CppUnit/framework/TestSuite.cpp \
+                   ../CppUnit/framework/TestSuite.h \
+                   ../CppUnit/TestRunner.cpp \
+                   ../CppUnit/TestRunner.hpp \
+                   ../CppUnit/textui/TextTestResult.cpp \
+                   ../CppUnit/textui/TextTestResult.h
+
+
+test_sources = arithmetic_test.hpp \
+               attr_value_test.hpp \
+               axis_enumerator_test.hpp \
+               execute_test.hpp \
+               expression_test.hpp \
+               logical_test.hpp \
+               match_test.hpp \
+               node_test_test.hpp \
+               parse_test.hpp \
+               relational_test.hpp \
+               step_test.hpp \
+               value_test.hpp \
+               xpath_test_suite.hpp
+
+xpath_test_SOURCES = main.cpp $(cppunit_sources) $(test_sources)
+xpath_test_DEPENDENCES = $(LIBARABICA)
+xpath_test_LDADD =  $(LIBARABICA)
+
+xpath_test_silly_SOURCES = main_silly.cpp $(cppunit_sources) $(test_sources) ../silly_string/silly_string.cpp
+xpath_test_silly_DEPENDENCES = $(LIBARABICA)
+xpath_test_silly_LDADD =  $(LIBARABICA)
+
+xpath_test_wide_SOURCES = main_wide.cpp $(cppunit_sources) $(test_sources) 
+xpath_test_wide_DEPENDENCES = $(LIBARABICA)
+xpath_test_wide_LDADD =  $(LIBARABICA)
+
+
+INCLUDES = -I$(top_srcdir)/include $(PARSER_HEADERS) $(BOOST_CPPFLAGS)
+
--- a/test/XPath/main_silly.cpp
+++ b/test/XPath/main_silly.cpp
@ -1,25 +1,25 @@
-
-#ifdef _MSC_VER
-#pragma warning(disable:4224 4267)
-#endif
-
-
-#include <iostream>
-#include "../XPath/xpath_test_suite.hpp"
-#include "../silly_string/silly_string.hpp"
-
-namespace Arabica
-{
-
-template<> class default_string_adaptor<silly_string> : public silly_string_adaptor { };
-
-} // namespace Arabica
-
-/////////////////////////////////////////
-int main(int argc, const char** argv)
-{
-  std::cout << "Hello" << std::endl;
-
-  XPath_test_suite<silly_string, Arabica::default_string_adaptor<silly_string> >(argc, argv);
-} // main
-
+
+#ifdef _MSC_VER
+#pragma warning(disable:4224 4267)
+#endif
+
+
+#include <iostream>
+#include "xpath_test_suite.hpp"
+#include "../silly_string/silly_string.hpp"
+
+namespace Arabica
+{
+
+template<> class default_string_adaptor<silly_string> : public silly_string_adaptor { };
+
+} // namespace Arabica
+
+/////////////////////////////////////////
+int main(int argc, const char** argv)
+{
+  std::cout << "Hello" << std::endl;
+
+  XPath_test_suite<silly_string, Arabica::default_string_adaptor<silly_string> >(argc, argv);
+} // main
+
--- a/test/XPath/main_wide.cpp
+++ b/test/XPath/main_wide.cpp
@ -7,7 +7,7 @@
 #include <iostream>
 #endif

-#include "../XPath/xpath_test_suite.hpp"
+#include "xpath_test_suite.hpp"

 /////////////////////////////////////////
 int main(int argc, const char** argv)
--- a/test/XPath_silly/Makefile
+++ b/test/XPath_silly/Makefile
@ -1,48 +0,0 @@
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-XPATH_SRCS = main.cpp ../silly_string/silly_string.cpp
-XPATH_TESTS = ../XPath/arithmetic_test.hpp \
-              ../XPath/axis_enumerator_test.hpp \
-              ../XPath/execute_test.hpp \
-              ../XPath/logical_test.hpp \
-              ../XPath/node_test_test.hpp \
-              ../XPath/parse_test.hpp \
-              ../XPath/relational_test.hpp \
-              ../XPath/step_test.hpp \
-              ../XPath/value_test.hpp \
-              ../XPath/xpath_test_suite.hpp
-XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
-
-######################################
-# High level rules
-all : xpath_test_ss$(EXESUFFIX)
-
-xpath_test_ss$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS) $(XPATH_TESTS)
-	$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) xpath_test_ss$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(XPATH_OBJS) \
-		xpath_test_ss$(EXESUFFIX) \
-		 ../../bin/xpath_test_ss$(EXESUFFIX) 
-
-
--- a/test/XPath_wide/Makefile
+++ b/test/XPath_wide/Makefile
@ -1,39 +0,0 @@
-include ../../Makefile.header
-include ../../Makefile.common
-
-######################################
-# ADDITIONAL BUILD FLAGS
-INCS_DIRS += -I../../include 
-LIBS_DIRS += -L../../bin 
-
-STATIC_LIBS +=
-DYNAMIC_LIBS += -lArabica
-
-######################################
-# SOURCE FILES
-XPATH_SRCS = main.cpp
-XPATH_HDRS = $(patsubst %.cpp,%.h,$(XPATH_SRCS))
-XPATH_OBJS = $(patsubst %.cpp,%.o,$(XPATH_SRCS))
-
-######################################
-# High level rules
-all : xpath_test_wide$(EXESUFFIX)
-
-xpath_test_wide$(EXESUFFIX) : $(XPATH_OBJS) $(CPPUNIT_OBJS)
-	$(LD) $(LDFLAGS) -o $@ $(XPATH_OBJS) $(CPPUNIT_OBJS) $(LIBS_DIRS) $(STATIC_LIBS) $(DYNAMIC_LIBS)
-	$(COPY) xpath_test_wide$(EXESUFFIX) ../../bin
-
-######################
-# Compile rules
-####
-include ../../Makefile.rules
-
-######################
-# Cleaning up
-clean :
-	$(REMOVE) $(CPPUNIT_OBJS) \
-		$(XPATH_OBJS) \
-		xpath_test_wide$(EXESUFFIX) \
-		 ../../bin/xpath_test_wide$(EXESUFFIX) 
-
-# End of File
--- a/vs7/ArabicaConfig.S
+++ b/vs7/ArabicaConfig.S
@ -1,40 +1,63 @@
-#define pasty(m, n) m##n
-#define include pasty(#, include)
-#define ifdef pasty(#, ifdef)
-#define ifndef pasty(#, ifndef)
-#define endif pasty(#, endif)
-#define define pasty(#, define)
-#define message pasty(#, pragma message)
-#define undef pasty(#, undef)
-#define error pasty(#, error)
-#define else pasty(#, else)
-#define comment pasty(#, pragma comment)
-
-
-ifndef ARABICA_ARABICA_CONFIG_H
-define ARABICA_ARABICA_CONFIG_H
-
-#ifdef ARABICA_NO_WCHAR_T
-#undef ARABICA_NO_WCHAR_T
-define ARABICA_NO_WCHAR_T
-#endif
-
-#ifdef _MSC_VER
-#if (_MSC_VER < 1300)
-define ARABICA_VS6_WORKAROUND
-#endif
-
-define ARABICA_NO_CODECVT_SPECIALISATIONS
-#endif
-
-#ifdef _WIN32
-define ARABICA_WINDOWS
-#endif
-
-#if defined(_DEBUG) || (__DEBUG__)
-define ARABICA_DEBUG
-#endif
-
-endif
-
-
+#define pasty(m, n) m##n
+#define include pasty(#, include)
+#define ifdef pasty(#, ifdef)
+#define ifndef pasty(#, ifndef)
+#define endif pasty(#, endif)
+#define define pasty(#, define)
+#define message pasty(#, pragma message)
+#define undef pasty(#, undef)
+#define error pasty(#, error)
+#define else pasty(#, else)
+#define comment pasty(#, pragma comment)
+
+
+ifndef ARABICA_ARABICA_CONFIG_H
+define ARABICA_ARABICA_CONFIG_H
+
+#ifdef ARABICA_NO_WCHAR_T
+#undef ARABICA_NO_WCHAR_T
+define ARABICA_NO_WCHAR_T
+#endif
+
+#ifdef _MSC_VER
+#if (_MSC_VER < 1300)
+define ARABICA_VS6_WORKAROUND
+#endif
+
+define ARABICA_NO_CODECVT_SPECIALISATIONS
+#endif
+
+define ARABICA_WINDOWS
+
+#if defined(_DEBUG) || (__DEBUG__)
+define ARABICA_DEBUG
+#endif
+
+#ifdef USE_LIBXML2
+#undef USE_LIBXML2
+define USE_LIBXML2
+#endif
+
+#ifdef USE_EXPAT
+#undef USE_EXPAT
+define USE_EXPAT
+#endif
+
+#ifdef USE_XERCES
+#undef USE_XERCES
+define USE_XERCES
+#endif
+
+#ifdef USE_GARDEN
+#undef USE_GARDEN
+define USE_GARDEN
+#endif
+
+#ifdef USE_MSXML
+#undef USE_MSXML
+define USE_MSXML
+#endif			
+				
+endif
+
+
--- a/examples/SAX2DOM/DOMWriter.vcproj
+++ b/examples/SAX2DOM/DOMWriter.vcproj
--- a/vs7/example_SAX_pyx.vcproj
+++ b/vs7/example_SAX_pyx.vcproj
--- a/vs7/example_SAX_simplehander.vcproj
+++ b/vs7/example_SAX_simplehander.vcproj
--- a/vs7/example_SAX_writer.vcproj
+++ b/vs7/example_SAX_writer.vcproj
--- a/examples/SAX/example_XMLBase.vcproj
+++ b/examples/SAX/example_XMLBase.vcproj
--- a/vs7/example_Utils_transcode.vcproj
+++ b/vs7/example_Utils_transcode.vcproj
--- a/vs7/example_XPath_xgrep.vcproj
+++ b/vs7/example_XPath_xgrep.vcproj
--- a/vs7/lib_arabica.vcproj
+++ b/vs7/lib_arabica.vcproj
@ -15,7 +15,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Debug"
+			IntermediateDirectory=".\Debug_Arabica"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -70,7 +70,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\lib"
-			IntermediateDirectory=".\Release"
+			IntermediateDirectory=".\Release_Arabica"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -127,83 +127,169 @@
 			Name="include"
 			Filter="h;hpp;hxx;hm;inl">
 			<Filter
-				Name="XPath"
+				Name="SAX"
 				Filter="">
 				<File
-					RelativePath="..\include\XPath\XPath.hpp">
+					RelativePath="..\include\Sax\AttributeList.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_arithmetic.hpp">
+					RelativePath="..\include\Sax\Attributes.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_ast.hpp">
+					RelativePath="..\include\Sax\ContentHandler.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_ast_ids.hpp">
+					RelativePath="..\include\Sax\DocumentHandler.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_axis_enumerator.hpp">
+					RelativePath="..\include\Sax\DTDHandler.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_compile_context.hpp">
+					RelativePath="..\include\Sax\EntityResolver.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_execution_context.hpp">
+					RelativePath="..\include\Sax\ErrorHandler.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_expression.hpp">
+					RelativePath="..\include\Sax\HandlerBase.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_function.hpp">
+					RelativePath="..\include\Sax\InputSource.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_function_holder.hpp">
+					RelativePath="..\include\Sax\IStreamHandle.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_function_resolver.hpp">
+					RelativePath="..\include\Sax\Locator.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_grammar.hpp">
+					RelativePath="..\include\Sax\Parser.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_logical.hpp">
+					RelativePath="..\include\Sax\SAXException.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_context.hpp">
+					RelativePath="..\include\Sax\saxfwd.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_namespace_node.hpp">
+					RelativePath="..\include\Sax\SAXNotRecognizedException.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_node_test.hpp">
+					RelativePath="..\include\Sax\SAXNotSupportedException.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_object.hpp">
+					RelativePath="..\include\Sax\SAXParseException.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_parser.hpp">
+					RelativePath="..\include\Sax\XMLFilter.h">
 				</File>
 				<File
-					RelativePath="..\include\XPath\impl\xpath_relational.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_resolver_holder.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_step.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_union.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_value.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable.hpp">
-				</File>
-				<File
-					RelativePath="..\include\XPath\impl\xpath_variable_resolver.hpp">
+					RelativePath="..\include\Sax\XMLReader.h">
 				</File>
+				<Filter
+					Name="ext"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\ext\Attributes2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\DeclHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\DefaultHandler2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\LexicalHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\Locator2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\ext\ProgressiveParser.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="filter"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\filter\Writer.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="helpers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeDefaults.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeListImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributesImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\AttributeTypes.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\CatchErrorHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\DefaultHandler.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\FeatureNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\InputSourceResolver.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\LocatorImpl.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\NamespaceSupport.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\ParserAdaptor.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\PropertyNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\XMLBaseSupport.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\helpers\XMLFilterImpl.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="parsers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\parsers\saxgarden.h">
+					</File>
+				</Filter>
+				<Filter
+					Name="wrappers"
+					Filter="">
+					<File
+						RelativePath="..\include\Sax\wrappers\saxexpat.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxlibxml2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxmsxml2.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\saxxerces.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.h">
+					</File>
+					<File
+						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.h">
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="DOM"
@ -395,6 +481,85 @@
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="XPath"
+				Filter="">
+				<File
+					RelativePath="..\include\XPath\XPath.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_arithmetic.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_ast.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_ast_ids.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_axis_enumerator.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_compile_context.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_execution_context.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_expression.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_function.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_function_holder.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_function_resolver.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_grammar.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_logical.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_namespace_context.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_namespace_node.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_node_test.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_object.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_parser.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_relational.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_resolver_holder.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_step.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_union.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_value.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_variable.hpp">
+				</File>
+				<File
+					RelativePath="..\include\XPath\impl\xpath_variable_resolver.hpp">
+				</File>
+			</Filter>
 			<Filter
 				Name="Utils"
 				Filter="">
@ -472,263 +637,76 @@
 					RelativePath="..\include\Xml\XMLCharacterClasses.h">
 				</File>
 			</Filter>
-			<Filter
-				Name="SAX"
-				Filter="">
-				<File
-					RelativePath="..\include\Sax\AttributeList.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\Attributes.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\ContentHandler.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\DocumentHandler.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\DTDHandler.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\EntityResolver.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\ErrorHandler.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\HandlerBase.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\InputSource.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\IStreamHandle.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\Locator.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\Parser.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXException.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\saxfwd.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotRecognizedException.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXNotSupportedException.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\SAXParseException.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLFilter.h">
-				</File>
-				<File
-					RelativePath="..\include\Sax\XMLReader.h">
-				</File>
-				<Filter
-					Name="ext"
-					Filter="">
-					<File
-						RelativePath="..\include\Sax\ext\Attributes2.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DeclHandler.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\DefaultHandler2.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\LexicalHandler.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\Locator2.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\ext\ProgressiveParser.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="filter"
-					Filter="">
-					<File
-						RelativePath="..\include\Sax\filter\Writer.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="helpers"
-					Filter="">
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeDefaults.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeListImpl.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributesImpl.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\AttributeTypes.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\CatchErrorHandler.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\DefaultHandler.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\FeatureNames.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\InputSourceResolver.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\LocatorImpl.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\NamespaceSupport.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\ParserAdaptor.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\PropertyNames.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLBaseSupport.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\helpers\XMLFilterImpl.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="parsers"
-					Filter="">
-					<File
-						RelativePath="..\include\Sax\parsers\saxgarden.h">
-					</File>
-				</Filter>
-				<Filter
-					Name="wrappers"
-					Filter="">
-					<File
-						RelativePath="..\include\Sax\wrappers\saxexpat.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxlibxml2.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxmsxml2.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\saxxerces.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesFeatureNames.h">
-					</File>
-					<File
-						RelativePath="..\include\Sax\wrappers\XercesPropertyNames.h">
-					</File>
-				</Filter>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="src"
 			Filter="">
+			<File
+				RelativePath="..\src\arabica.cpp">
+			</File>
 			<File
 				RelativePath="ArabicaConfig.S">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP  ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h"
+						CommandLine="cl /TC /EP  -D USE_MSXML ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
+"
 						Outputs="..\include\SAX\ArabicaConfig.h"/>
 				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /EP  ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h"
+						CommandLine="cl /TC /EP -D USE_MSXML  ArabicaConfig.S &gt; ..\include\SAX\ArabicaConfig.h
+"
 						Outputs="ArabicaConfig.h"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\ParserConfig.S">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S &gt; ..\include\SAX\ParserConfig.h
-cl /TC /D USE_MSXML /EP saxlib.S &gt; saxlib.cpp
-"
-						Outputs="..\include\SAX\ParserConfig.h;saxlib.cpp"/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						CommandLine="cl /TC /D USE_MSXML /EP ParserConfig.S &gt; ..\include\SAX\ParserConfig.h
-cl /TC /D USE_MSXML /EP saxlib.S &gt; saxlib.cpp
-"
-						Outputs="..\include\SAX\ParserConfig.h;saxlib.cpp"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\saxlib.cpp">
-			</File>
-			<File
-				RelativePath=".\saxlib.S">
-			</File>
 			<Filter
 				Name="Utils"
 				Filter="">
 				<File
-					RelativePath=".\Utils\base64codecvt.cpp">
+					RelativePath="..\src\Utils\base64codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\iso88591utf8codecvt.cpp">
+					RelativePath="..\src\Utils\iso88591utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\rot13codecvt.cpp">
+					RelativePath="..\src\Utils\rot13codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\ucs2utf8codecvt.cpp">
+					RelativePath="..\src\Utils\ucs2utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\utf16beucs2codecvt.cpp">
+					RelativePath="..\src\Utils\utf16beucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\utf16leucs2codecvt.cpp">
+					RelativePath="..\src\Utils\utf16leucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\utf16utf8codecvt.cpp">
+					RelativePath="..\src\Utils\utf16utf8codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\utf8iso88591codecvt.cpp">
+					RelativePath="..\src\Utils\utf8iso88591codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\Utils\utf8ucs2codecvt.cpp">
+					RelativePath="..\src\Utils\utf8ucs2codecvt.cpp">
 				</File>
 				<File
-					RelativePath=".\XML\XMLCharacterClasses.cpp">
+					RelativePath="..\src\XML\XMLCharacterClasses.cpp">
 				</File>
 				<Filter
 					Name="impl"
 					Filter="">
 					<File
-						RelativePath=".\Utils\impl\iso88591_utf8.cpp">
+						RelativePath="..\src\Utils\impl\iso88591_utf8.cpp">
 					</File>
 					<File
-						RelativePath=".\Utils\impl\ucs2_utf16.cpp">
+						RelativePath="..\src\Utils\impl\ucs2_utf16.cpp">
 					</File>
 					<File
-						RelativePath=".\Utils\impl\ucs2_utf8.cpp">
+						RelativePath="..\src\Utils\impl\ucs2_utf8.cpp">
 					</File>
 				</Filter>
 			</Filter>
@ -739,7 +717,7 @@ cl /TC /D USE_MSXML /EP saxlib.S &gt; saxlib.cpp
 					Name="Helpers"
 					Filter="">
 					<File
-						RelativePath=".\SAX\helpers\InputSourceResolver.cpp">
+						RelativePath="..\src\SAX\helpers\InputSourceResolver.cpp">
 					</File>
 				</Filter>
 			</Filter>
--- a/test/DOM/DOM_test.vcproj
+++ b/test/DOM/DOM_test.vcproj
@ -13,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -23,17 +23,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/DOM_test.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=".\Debug_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Debug_test_DOM/"
+				ObjectFile=".\Debug_test_DOM/"
+				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@ -49,11 +49,11 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/DOM_test.pdb"
+				ProgramDatabaseFile=".\..\bin/DOM_test.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/DOM_test.tlb"/>
+				TypeLibraryName=".\..\bin/DOM_test.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -77,8 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@ -94,10 +94,10 @@
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/DOM_test.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -109,11 +109,11 @@
 				OutputFile="$(OutDir)/DOM_test.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/DOM_test.pdb"
+				ProgramDatabaseFile=".\Release_test_DOM/DOM_test.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/DOM_test.tlb"/>
+				TypeLibraryName=".\Release_test_DOM/DOM_test.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -143,107 +143,107 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\main.cpp">
+				RelativePath=".\..\test\DOM\main.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath=".\dom_test_suite.hpp">
+				RelativePath=".\..\test\DOM\dom_test_suite.hpp">
 			</File>
 			<File
-				RelativePath=".\test_Attribute.h">
+				RelativePath=".\..\test\DOM\test_Attribute.h">
 			</File>
 			<File
-				RelativePath=".\test_CDATA.hpp">
+				RelativePath=".\..\test\DOM\test_CDATA.hpp">
 			</File>
 			<File
-				RelativePath=".\test_CharacterData.hpp">
+				RelativePath=".\..\test\DOM\test_CharacterData.hpp">
 			</File>
 			<File
-				RelativePath=".\test_Document.h">
+				RelativePath=".\..\test\DOM\test_Document.h">
 			</File>
 			<File
-				RelativePath=".\test_DocumentFragment.h">
+				RelativePath=".\..\test\DOM\test_DocumentFragment.h">
 			</File>
 			<File
-				RelativePath=".\test_DocumentType.h">
+				RelativePath=".\..\test\DOM\test_DocumentType.h">
 			</File>
 			<File
-				RelativePath=".\test_DOMImplementation.h">
+				RelativePath=".\..\test\DOM\test_DOMImplementation.h">
 			</File>
 			<File
-				RelativePath=".\test_Element.h">
+				RelativePath=".\..\test\DOM\test_Element.h">
 			</File>
 			<File
-				RelativePath=".\test_ProcessingInstruction.h">
+				RelativePath=".\..\test\DOM\test_ProcessingInstruction.h">
 			</File>
 			<File
-				RelativePath=".\test_Siblings.h">
+				RelativePath=".\..\test\DOM\test_Siblings.h">
 			</File>
 			<File
-				RelativePath=".\test_Text.hpp">
+				RelativePath=".\..\test\DOM\test_Text.hpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Libs">
 			<File
-				RelativePath="..\..\lib\Arabica.lib">
+				RelativePath="..\lib\Arabica.lib">
 			</File>
 		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
-				RelativePath="..\CppUnit\framework\CppUnitException.h">
+				RelativePath="..\test\CppUnit\framework\CppUnitException.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\estring.h">
+				RelativePath="..\test\CppUnit\framework\estring.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Guards.h">
+				RelativePath="..\test\CppUnit\framework\Guards.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Test.h">
+				RelativePath="..\test\CppUnit\framework\Test.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCaller.h">
+				RelativePath="..\test\CppUnit\framework\TestCaller.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.cpp">
+				RelativePath="..\test\CppUnit\framework\TestCase.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.h">
+				RelativePath="..\test\CppUnit\framework\TestCase.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.cpp">
+				RelativePath="..\test\CppUnit\framework\TestFailure.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.h">
+				RelativePath="..\test\CppUnit\framework\TestFailure.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.cpp">
+				RelativePath="..\test\CppUnit\framework\TestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.h">
+				RelativePath="..\test\CppUnit\framework\TestResult.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.cpp">
+				RelativePath="..\test\CppUnit\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.hpp">
+				RelativePath="..\test\CppUnit\TestRunner.hpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.cpp">
+				RelativePath="..\test\CppUnit\framework\TestSuite.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.h">
+				RelativePath="..\test\CppUnit\framework\TestSuite.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.cpp">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.h">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.h">
 			</File>
 		</Filter>
 	</Files>
--- a/test/DOM_silly/DOM_test_silly.vcproj
+++ b/test/DOM_silly/DOM_test_silly.vcproj
@ -13,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -23,17 +23,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/SAX2DOM_test.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.pch"
+				AssemblerListingLocation=".\Debug_test_DOM/"
+				ObjectFile=".\Debug_test_DOM/"
+				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@ -44,16 +44,16 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="wsock32.lib"
-				OutputFile="$(OutDir)/DOM_test_ss.exe"
+				OutputFile="$(OutDir)/DOM_test_silly.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/DOM_test_ss.pdb"
+				ProgramDatabaseFile=".\..\bin/DOM_test_silly.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/DOM_test_ss.tlb"/>
+				TypeLibraryName=".\..\bin/DOM_test_silly.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -77,8 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@ -94,10 +94,10 @@
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/DOM_test.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -106,14 +106,14 @@
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="wsock32.lib"
-				OutputFile="$(OutDir)/DOM_test_ss.exe"
+				OutputFile="$(OutDir)/DOM_test_silly.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/DOM_test_ss.pdb"
+				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_silly.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/DOM_test_ss.tlb"/>
+				TypeLibraryName=".\Release_test_DOM/DOM_test_silly.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -143,80 +143,80 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\main.cpp">
+				RelativePath="..\test\DOM\main_silly.cpp">
 			</File>
 			<File
-				RelativePath="..\silly_string\silly_string.cpp">
+				RelativePath="..\test\silly_string\silly_string.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="..\Dom\dom_test_suite.hpp">
+				RelativePath="..\test\Dom\dom_test_suite.hpp">
 			</File>
 			<File
-				RelativePath="..\silly_string\silly_string.hpp">
+				RelativePath="..\test\silly_string\silly_string.hpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Libs">
 			<File
-				RelativePath="..\..\lib\Arabica.lib">
+				RelativePath="..\lib\Arabica.lib">
 			</File>
 		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
-				RelativePath="..\CppUnit\framework\CppUnitException.h">
+				RelativePath="..\test\CppUnit\framework\CppUnitException.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\estring.h">
+				RelativePath="..\test\CppUnit\framework\estring.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Guards.h">
+				RelativePath="..\test\CppUnit\framework\Guards.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Test.h">
+				RelativePath="..\test\CppUnit\framework\Test.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCaller.h">
+				RelativePath="..\test\CppUnit\framework\TestCaller.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.cpp">
+				RelativePath="..\test\CppUnit\framework\TestCase.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.h">
+				RelativePath="..\test\CppUnit\framework\TestCase.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.cpp">
+				RelativePath="..\test\CppUnit\framework\TestFailure.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.h">
+				RelativePath="..\test\CppUnit\framework\TestFailure.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.cpp">
+				RelativePath="..\test\CppUnit\framework\TestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.h">
+				RelativePath="..\test\CppUnit\framework\TestResult.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.cpp">
+				RelativePath="..\test\CppUnit\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.hpp">
+				RelativePath="..\test\CppUnit\TestRunner.hpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.cpp">
+				RelativePath="..\test\CppUnit\framework\TestSuite.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.h">
+				RelativePath="..\test\CppUnit\framework\TestSuite.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.cpp">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.h">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.h">
 			</File>
 		</Filter>
 	</Files>
--- a/test/DOM_wide/DOM_test_wide.vcproj
+++ b/test/DOM_wide/DOM_test_wide.vcproj
@ -13,8 +13,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Debug"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Debug_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -23,17 +23,17 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm200"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Debug/SAX2DOM_test.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
+				PrecompiledHeaderFile=".\Debug_test_DOM/SAX2DOM_test.pch"
+				AssemblerListingLocation=".\Debug_test_DOM/"
+				ObjectFile=".\Debug_test_DOM/"
+				ProgramDataBaseFileName=".\Debug_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
 				DebugInformationFormat="4"
@ -49,11 +49,11 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\..\..\bin/DOM_test_wide.pdb"
+				ProgramDatabaseFile=".\..\bin/DOM_test_wide.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\..\..\bin/DOM_test_wide.tlb"/>
+				TypeLibraryName=".\..\bin/DOM_test_wide.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -77,8 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory=".\..\..\bin"
-			IntermediateDirectory=".\Release"
+			OutputDirectory=".\..\bin"
+			IntermediateDirectory=".\Release_test_DOM"
 			ConfigurationType="1"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="FALSE"
@ -86,7 +86,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\include"
+				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@ -94,10 +94,10 @@
 				TreatWChar_tAsBuiltInType="TRUE"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				PrecompiledHeaderFile=".\Release/DOM_test.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
+				PrecompiledHeaderFile=".\Release_test_DOM/DOM_test.pch"
+				AssemblerListingLocation=".\Release_test_DOM/"
+				ObjectFile=".\Release_test_DOM/"
+				ProgramDataBaseFileName=".\Release_test_DOM/"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"/>
 			<Tool
@ -109,11 +109,11 @@
 				OutputFile="$(OutDir)/DOM_test_wide.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				ProgramDatabaseFile=".\Release/DOM_test_wide.pdb"
+				ProgramDatabaseFile=".\Release_test_DOM/DOM_test_wide.pdb"
 				SubSystem="1"/>
 			<Tool
 				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/DOM_test_wide.tlb"/>
+				TypeLibraryName=".\Release_test_DOM/DOM_test_wide.tlb"/>
 			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
@ -143,74 +143,74 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
 			<File
-				RelativePath=".\main.cpp">
+				RelativePath="..\test\DOM\main_wide.cpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl">
 			<File
-				RelativePath="..\Dom\dom_test_suite.hpp">
+				RelativePath="..\test\DOM\dom_test_suite.hpp">
 			</File>
 		</Filter>
 		<Filter
 			Name="Libs">
 			<File
-				RelativePath="..\..\lib\Arabica.lib">
+				RelativePath="..\lib\Arabica.lib">
 			</File>
 		</Filter>
 		<Filter
 			Name="CppUnit">
 			<File
-				RelativePath="..\CppUnit\framework\CppUnitException.h">
+				RelativePath="..\test\CppUnit\framework\CppUnitException.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\estring.h">
+				RelativePath="..\test\CppUnit\framework\estring.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Guards.h">
+				RelativePath="..\test\CppUnit\framework\Guards.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\Test.h">
+				RelativePath="..\test\CppUnit\framework\Test.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCaller.h">
+				RelativePath="..\test\CppUnit\framework\TestCaller.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.cpp">
+				RelativePath="..\test\CppUnit\framework\TestCase.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestCase.h">
+				RelativePath="..\test\CppUnit\framework\TestCase.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.cpp">
+				RelativePath="..\test\CppUnit\framework\TestFailure.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestFailure.h">
+				RelativePath="..\test\CppUnit\framework\TestFailure.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.cpp">
+				RelativePath="..\test\CppUnit\framework\TestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestResult.h">
+				RelativePath="..\test\CppUnit\framework\TestResult.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.cpp">
+				RelativePath="..\test\CppUnit\TestRunner.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\TestRunner.hpp">
+				RelativePath="..\test\CppUnit\TestRunner.hpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.cpp">
+				RelativePath="..\test\CppUnit\framework\TestSuite.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\framework\TestSuite.h">
+				RelativePath="..\test\CppUnit\framework\TestSuite.h">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.cpp">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.cpp">
 			</File>
 			<File
-				RelativePath="..\CppUnit\textui\TextTestResult.h">
+				RelativePath="..\test\CppUnit\textui\TextTestResult.h">
 			</File>
 		</Filter>
 	</Files>
--- a/test/SAX2DOM/SAX2DOM_test.vcproj
+++ b/test/SAX2DOM/SAX2DOM_test.vcproj
--- a/vs7/test_SAX_filter.vcproj
+++ b/vs7/test_SAX_filter.vcproj
--- a/test/XPath/xpathic.vcproj
+++ b/test/XPath/xpathic.vcproj
--- a/test/XPath_silly/xpathic_silly.vcproj
+++ b/test/XPath_silly/xpathic_silly.vcproj
--- a/test/XPath_wide/xpathic_wide.vcproj
+++ b/test/XPath_wide/xpathic_wide.vcproj
				`@ -0,0 +1,2 @@`
				`For latest Arabica news, please see http://www.jezuk.co.uk/arabica`