Turn libodb-mysql repository into package for muti-package repositorylibodb-mysql

161 files changed, 32 insertions, 3292 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 3004ad1..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,37 +0,0 @@
-.bdep/
-
-# Compiler/linker output.
-#
-*.d
-*.t
-*.i
-*.ii
-*.o
-*.obj
-*.so
-*.dll
-*.a
-*.lib
-*.exp
-*.pdb
-*.ilk
-*.exe
-*.exe.dlls/
-*.exe.manifest
-*.pc
-
-*.l
-*.l.cpp-options
-
-# Generated documentation.
-#
-*.pdf
-*.ps
-
-# Generated build system files.
-#
-*-dynamic.make
-
-# Generated .gitignore files.
-#
-.gitignore
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index b14cbe2..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,103 +0,0 @@
-Prerequisites
-=============
-
-  - libodb           http://www.codesynthesis.com/products/odb/
-  - libmysqlclient   http://dev.mysql.com/downloads/mysql/
-
-
-Building on UNIX
-================
-
-The following build instructions are for the Linux/UNIX/Mac OS X
-operating systems as well as for Cygwin and MinGW on Windows.
-
-The standard autotools-based build system is used on these platforms. 
-After unpacking the source code archive, change to the libodb-mysql
-package directory (referred to as libodb-mysql/ from now on) and run
-the configure script:
-
-./configure
-
-To see the available configuration options run configure with --help:
-
-./configure --help
-
-The configure script expects the libodb and libmysqlclient headers
-and libraries to be installed in a directory where the C++ compiler
-and linker will search for them by default (normally /usr and 
-/usr/local). If these libraries are installed in other directories,
-you can use the CPPFLAGS and LDFLAGS configure variables to specify
-their locations, for example:
-
-./configure CPPFLAGS=-I/opt/libodb/include LDFLAGS=-L/opt/libodb/lib
-
-If libodb is not installed and you would like to use its build
-directory instead, you can use the --with-libodb configure option
-to specify its location, for example:
-
-./configure --with-libodb=/tmp/libodb
-
-As another example, the following configure command only builds shared
-libraries, uses the specified C++ compiler, and compiles with optimization
-and without debug information:
-
-./configure --disable-static CXX=g++-4.5 CXXFLAGS=-O3
-
-Once configuration is complete, run make to build libodb-mysql:
-
-make
-
-Once the build is completed successfully, you can install the libodb-mysql
-headers and libraries using the install target (you may need to do this
-step as root depending on the installation directory):
-
-make install
-
-
-Building on Windows
-===================
-
-The following build instructions are for Windows using Microsoft Visual
-Studio. If you would like to build libodb-mysql with GCC either using
-Cygwin or MinGW, refer to the "Building on UNIX" section above.
-
-The standard Visual Studio project and solution files are used on this
-platform. The provided project files expect the libodb and libmysqlclient
-header and import library directories to be in the VC++ Directories
-Include and Library search lists. For libodb, see the INSTALL file in
-the package directory for more information on how to setup the VC++
-Directories.
-
-For libmysqlclient, add the include\ directory inside the MySQL package
-to the Include search list and the lib\opt\ directory to the Library
-search list.
-
-To build libodb-mysql, unpack the source code archive and open the
-libodb-mysql-vc<N>.sln file located in the libodb-mysql package
-directory (referred to as libodb-mysql\ from now on). Here <N> is the
-version of Visual Studio that you are using. Once the solution is open,
-select the desired build configuration (Debug or Release) and platform
-(Win32 or x64) and build the solution.
-
-The resulting 32-bit DLLs and import libraries are placed into the 
-libodb-mysql\bin\ and libodb-mysql\lib\ directories, respectively.
-Similarly, the 64-bit DLLs and import libraries are placed into
-libodb-mysql\bin64\ and libodb-mysql\lib64\. The Release versions of
-the import libraries are named odb-mysql.lib and the Debug versions
-are named odb-mysql-d.lib.
-
-To configure Visual Studio to automatically locate the libodb-mysql
-headers, DLLs, and import libraries, add the following paths to your
-VC++ Directories:
-
-Win32:
-
-  Include:    ...\libodb-mysql
-  Library:    ...\libodb-mysql\lib
-  Executable: ...\libodb-mysql\bin    
-
-x64:
-
-  Include:    ...\libodb-mysql
-  Library:    ...\libodb-mysql\lib64
-  Executable: ...\libodb-mysql\bin64    
diff --git a/INSTALL-GIT b/INSTALL-GIT
deleted file mode 100644
index f917af5..0000000
--- a/INSTALL-GIT
+++ /dev/null
@@ -1,78 +0,0 @@
-The following instructions describe how to work with the source code that was
-checked out from the git repository.
-
-The major difference between using a released source code package and source
-code from the repository is that the former does not contain autotools-based
-makefiles or Visual Studio project files. Instead, it contains templates for
-these files as well as its own, custom build system. This build system is
-used for development as well as to automatically generate the autotools and
-Visual Studio files.
-
-This file describes how to use this build system to build the package as well
-as to create a release-ready source distribution which contains the autotools
-build system and Visual Studio project files.
-
-
-Prerequisites
-=============
-
-Besides the prerequisites listed in the INSTALL file, you will need the
-following additional packages:
-
-  - GNU bash >= 2.0.0   http://www.gnu.org/software/bash/
-  - GNU make >= 3.81    http://www.gnu.org/software/make/
-  - build    >= latest  http://www.codesynthesis.com/projects/build/
-
-If you are planning to create the source code distributions, then you will
-also need the following packages:
-
-  - GNU m4   >= 1.4.0   http://www.gnu.org/software/m4/
-  - GNU sed  >= 4.0.0   http://www.gnu.org/software/sed/
-  - tofrodos >= 1.7.0   http://www.thefreecountry.com/tofrodos/
-
-As we as the GNU autotools:
-
-  - GNU libtool  >= 2.2.6b  http://www.gnu.org/software/libtool/
-  - GNU autoconf >= 2.67    http://www.gnu.org/software/autoconf/
-  - GNU automake >= 1.11.1  http://www.gnu.org/software/automake/
-
-Any reasonably up to date GNU/Linux installation would normally have all of
-the above packages already present, except for build and maybe tofrodos.
-
-
-Configuring and Building
-========================
-
-To build the source code simply run make in the root directory of the package.
-The first time you run make, the build process will also configure the
-package by asking you several questions. On the subsequent runs, make will
-only rebuild what has changed.
-
-To run the automated test suite (if any), run 'make test'. To clean the object
-files, executables, etc., run 'make clean'. To de-configure the package (that
-is, to remove configuration files in addition to objects, executables, etc.),
-run 'make disfigure'.
-
-
-Creating Distribution
-=====================
-
-To create the source code distribution, use the dist make target as well as
-the dist_prefix variable to specify the directory where the distribution files
-should be placed. For example:
-
-make dist dist_prefix=/tmp/package-1.1.0
-
-Once the distribution files are ready, change to the distribution directory
-and run the bootstrap script to bootstrap the autotools build system, for
-example:
-
-cd /tmp/package-1.1.0
-./bootsrap
-
-To create the source code archives, use the autotools build system. First
-configuring the package (see the INSTALL file for more information on this
-step) and then use the dist target to make the archives, for example:
-
-./configure
-make dist
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 232992e..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-# file      : Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-SUBDIRS = __path__(dirs)
-dist_doc_DATA = __file__(docs)
-EXTRA_DIST = __file__(extra_dist)
-ACLOCAL_AMFLAGS = -I m4
-
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA= libodb-mysql.pc
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 72d0f8b..0000000
--- a/NEWS
+++ /dev/null
@@ -1 +0,0 @@
-See the common NEWS file in the ODB compiler package.
diff --git a/README-GIT b/README-GIT
deleted file mode 100644
index d855df1..0000000
--- a/README-GIT
+++ /dev/null
@@ -1,5 +0,0 @@
-The checked out odb/mysql/version-build2.hxx will be overwritten during the
-build process but these changes should be ignored. To do this automatically,
-run:
-
-git update-index --assume-unchanged odb/mysql/version-build2.hxx
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 85d1399..0000000
--- a/bootstrap
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-# file      : bootstrap
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-#
-# Bootstrap the automake build system.
-#
-
-rm -f config.cache
-
-if test ! -d m4; then
-  mkdir m4
-fi
-
-autoreconf --install
diff --git a/build/bootstrap.make b/build/bootstrap.make
deleted file mode 100644
index f158feb..0000000
--- a/build/bootstrap.make
+++ /dev/null
@@ -1,70 +0,0 @@
-# file      : build/bootstrap.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-project_name := libodb-mysql
-
-# First try to include the bundled bootstrap.make if it exist. If that
-# fails, let make search for the external bootstrap.make.
-#
-build := build-0.3
-
--include $(dir $(lastword $(MAKEFILE_LIST)))../../$(build)/bootstrap.make
-
-ifeq ($(patsubst %build/bootstrap.make,,$(lastword $(MAKEFILE_LIST))),)
-include $(build)/bootstrap.make
-endif
-
-
-# Aliases
-#
-.PHONY: $(out_base)/       \
-        $(out_base)/.test  \
-        $(out_base)/.dist  \
-        $(out_base)/.clean
-
-ifdef %interactive%
-
-.PHONY: test dist clean
-
-test:  $(out_base)/.test
-dist:  $(out_base)/.dist
-clean: $(out_base)/.clean
-
-ifneq ($(filter $(.DEFAULT_GOAL),test dist clean),)
-.DEFAULT_GOAL :=
-endif
-
-endif
-
-# Make sure the distribution prefix is set if the goal is dist.
-#
-ifneq ($(filter $(MAKECMDGOALS),dist),)
-ifeq ($(dist_prefix),)
-$(error dist_prefix is not set)
-endif
-endif
-
-# If we don't have dependency auto-generation then we need to manually
-# make sure that generated files are generated before C++ file are
-# compiler. To do this we make the object files ($2) depend in order-
-# only on generated files ($3).
-#
-ifeq ($(cxx_id),generic)
-
-define include-dep
-$(if $2,$(eval $2: | $3))
-endef
-
-else
-
-define include-dep
-$(call -include,$1)
-endef
-
-endif
-
-# Don't include dependency info for certain targets.
-#
-ifneq ($(filter $(MAKECMDGOALS),clean disfigure dist),)
-include-dep =
-endif
diff --git a/build/export/libodb-mysql/stub.make b/build/export/libodb-mysql/stub.make
deleted file mode 100644
index ce7d9b1..0000000
--- a/build/export/libodb-mysql/stub.make
+++ /dev/null
@@ -1,8 +0,0 @@
-# file      : build/export/libodb-mysql/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(src_root)/odb/mysql/makefile,$(out_root))
-
-$(call export,\
-  l: $(out_root)/odb/mysql/odb-mysql.l,\
-  cpp-options: $(out_root)/odb/mysql/odb-mysql.l.cpp-options)
diff --git a/build/import/cli/cli-cxx.make b/build/import/cli/cli-cxx.make
deleted file mode 100644
index 9bdf238..0000000
--- a/build/import/cli/cli-cxx.make
+++ /dev/null
@@ -1,47 +0,0 @@
-# file      : build/import/cli/cli-cxx.make
-# license   : MIT; see accompanying LICENSE file
-
-# Here we are operating in the importing project's space, not in
-# cli's.
-#
-
-# Get the C++ file extensions.
-#
-$(call include,$(bld_root)/cxx/configuration-static.make)
-
-cli_pattern :=                \
-$(out_base)/%.$(cxx_s_suffix) \
-$(out_base)/%.$(cxx_h_suffix) \
-$(out_base)/%.$(cxx_i_suffix)
-
-$(cli_pattern): cli_options := \
---hxx-suffix .$(cxx_h_suffix)  \
---ixx-suffix .$(cxx_i_suffix)  \
---cxx-suffix .$(cxx_s_suffix)
-
-.PRECIOUS: $(cli_pattern)
-
-ifeq ($(out_base),$(src_base))
-
-$(cli_pattern): $(src_base)/%.cli
-	$(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<)
-
-else
-
-$(cli_pattern): $(src_base)/%.cli | $$(dir $$@).
-	$(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<)
-
-$(cli_pattern): $(out_base)/%.cli | $$(dir $$@).
-	$(call message,cli $<,$(cli) $(cli_options) --output-dir $(dir $@) $<)
-endif
-
-.PHONY: $(out_base)/%.cxx.cli.clean
-
-$(out_base)/%.cxx.cli.clean: cxx_s_suffix := $(cxx_s_suffix)
-$(out_base)/%.cxx.cli.clean: cxx_h_suffix := $(cxx_h_suffix)
-$(out_base)/%.cxx.cli.clean: cxx_i_suffix := $(cxx_i_suffix)
-
-$(out_base)/%.cxx.cli.clean:
-	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_s_suffix)))
-	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_h_suffix)))
-	$(call message,rm $$1,rm -f $$1,$(@:.cxx.cli.clean=.$(cxx_i_suffix)))
diff --git a/build/import/cli/configuration-rules.make b/build/import/cli/configuration-rules.make
deleted file mode 100644
index 6355000..0000000
--- a/build/import/cli/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/cli/configuration-rules.make
-# license   : MIT; see accompanying LICENSE file
-
-$(dcf_root)/import/cli/configuration-dynamic.make: | $(dcf_root)/import/cli/.
-	$(call message,,$(scf_root)/import/cli/configure $@)
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/import/cli/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/cli/configuration-dynamic.make)
-
-endif
diff --git a/build/import/cli/configure b/build/import/cli/configure
deleted file mode 100755
index 2a1fde4..0000000
--- a/build/import/cli/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/cli/configure
-# license   : MIT; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'cli' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed "
-$echo "version of 'cli' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'cli'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'cli'."
-$eche
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo cli_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/cli/stub.make b/build/import/cli/stub.make
deleted file mode 100644
index 741b371..0000000
--- a/build/import/cli/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/cli/stub.make
-# license   : MIT; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/cli/configuration-rules.make,$(dcf_root))
-
-cli_installed :=
-
-$(call -include,$(dcf_root)/import/cli/configuration-dynamic.make)
-
-ifdef cli_installed
-
-ifeq ($(cli_installed),y)
-
-$(call export,cli: cli,cli-rules: $(scf_root)/import/cli/cli-cxx.make)
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/cli/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libmysqlclient/configuration-rules.make b/build/import/libmysqlclient/configuration-rules.make
deleted file mode 100644
index a8cf832..0000000
--- a/build/import/libmysqlclient/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libmysqlclient/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libmysqlclient/configuration-dynamic.make: | $(dcf_root)/import/libmysqlclient/.
-	$(call message,,$(scf_root)/import/libmysqlclient/configure $@)
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libmysqlclient/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libmysqlclient/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libmysqlclient/configure b/build/import/libmysqlclient/configure
deleted file mode 100755
index 44ea4d8..0000000
--- a/build/import/libmysqlclient/configure
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libmysqlclient/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out config file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'MySQL library' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed version"
-$echo "of 'MySQL library' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-type=
-
-if [ "$installed" = "n" ]; then
-
-  $echo
-  $echo "Please enter the 'MySQL' root directory."
-  $echo
-
-  root=`read_path --directory --exist`
-
-  $echo
-  $echo "Please select the library type you would like to use:"
-  $echo
-  $echo "(1) archive"
-  $echo "(2) shared object"
-  $echo
-
-  type=`read_option "archive shared" "shared"`
-
-fi
-
-echo libmysqlclient_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-  echo libmysqlclient_root := $root >>$1
-  echo libmysqlclient_type := $type >>$1
-
-fi
diff --git a/build/import/libmysqlclient/rules.make b/build/import/libmysqlclient/rules.make
deleted file mode 100644
index 5a51325..0000000
--- a/build/import/libmysqlclient/rules.make
+++ /dev/null
@@ -1,29 +0,0 @@
-# file      : build/import/libmysqlclient/rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libmysqlclient/%: root := $(libmysqlclient_root)
-
-ifeq ($(libmysqlclient_type),archive)
-
-$(dcf_root)/import/libmysqlclient/mysqlclient.l: $(libmysqlclient_root)/libmysql/.libs/libmysqlclient.a
-	@echo $< >$@
-else
-
-$(dcf_root)/import/libmysqlclient/mysqlclient.l: $(libmysqlclient_root)/libmysql/.libs/libmysqlclient.so
-	@echo $< >$@
-	@echo rpath:$(root)/libmysql/.libs >>$@
-endif
-
-$(dcf_root)/import/libmysqlclient/mysqlclient.l.cpp-options:
-	@ln -s $(root)/include $(dcf_root)/import/libmysqlclient/mysql
-	@echo include: -I$(dcf_root)/import/libmysqlclient >$@
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libmysqlclient/mysqlclient.l,\
-rm -f $(dcf_root)/import/libmysqlclient/mysqlclient.l)
-	$(call message,,rm -f $(dcf_root)/import/libmysqlclient/mysql)
-	$(call message,,rm -f $(dcf_root)/import/libmysqlclient/mysqlclient.l.cpp-options)
-
-endif
diff --git a/build/import/libmysqlclient/stub.make b/build/import/libmysqlclient/stub.make
deleted file mode 100644
index f11db21..0000000
--- a/build/import/libmysqlclient/stub.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# file      : build/import/libmysqlclient/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libmysqlclient/configuration-rules.make,$(dcf_root))
-
-libmysqlclient_installed :=
-
-$(call -include,$(dcf_root)/import/libmysqlclient/configuration-dynamic.make)
-
-ifdef libmysqlclient_installed
-
-ifeq ($(libmysqlclient_installed),y)
-
-$(call export,l: -lmysqlclient,cpp-options: )
-
-else
-
-$(call include-once,$(scf_root)/import/libmysqlclient/rules.make,$(dcf_root))
-
-$(call export,\
-  l: $(dcf_root)/import/libmysqlclient/mysqlclient.l,\
-  cpp-options: $(dcf_root)/import/libmysqlclient/mysqlclient.l.cpp-options)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libmysqlclient/version b/build/import/libmysqlclient/version
deleted file mode 100644
index 6e8bf73..0000000
--- a/build/import/libmysqlclient/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.0
diff --git a/build/import/libmysqlclient_r/configuration-rules.make b/build/import/libmysqlclient_r/configuration-rules.make
deleted file mode 100644
index b54abfc..0000000
--- a/build/import/libmysqlclient_r/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libmysqlclient_r/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libmysqlclient_r/configuration-dynamic.make: | $(dcf_root)/import/libmysqlclient_r/.
-	$(call message,,$(scf_root)/import/libmysqlclient_r/configure $@)
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libmysqlclient_r/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libmysqlclient_r/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libmysqlclient_r/configure b/build/import/libmysqlclient_r/configure
deleted file mode 100755
index a065d80..0000000
--- a/build/import/libmysqlclient_r/configure
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libmysqlclient_r/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out config file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'MySQL library' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed version"
-$echo "of 'MySQL library' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-type=
-
-if [ "$installed" = "n" ]; then
-
-  $echo
-  $echo "Please enter the 'MySQL' root directory."
-  $echo
-
-  root=`read_path --directory --exist`
-
-  $echo
-  $echo "Please select the library type you would like to use:"
-  $echo
-  $echo "(1) archive"
-  $echo "(2) shared object"
-  $echo
-
-  type=`read_option "archive shared" "shared"`
-
-fi
-
-echo libmysqlclient_r_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-  echo libmysqlclient_r_root := $root >>$1
-  echo libmysqlclient_r_type := $type >>$1
-
-fi
diff --git a/build/import/libmysqlclient_r/rules.make b/build/import/libmysqlclient_r/rules.make
deleted file mode 100644
index 02fe92b..0000000
--- a/build/import/libmysqlclient_r/rules.make
+++ /dev/null
@@ -1,29 +0,0 @@
-# file      : build/import/libmysqlclient_r/rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libmysqlclient_r/%: root := $(libmysqlclient_r_root)
-
-ifeq ($(libmysqlclient_r_type),archive)
-
-$(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l: $(libmysqlclient_r_root)/libmysql/.libs/libmysqlclient_r.a
-	@echo $< >$@
-else
-
-$(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l: $(libmysqlclient_r_root)/libmysql/.libs/libmysqlclient_r.so
-	@echo $< >$@
-	@echo rpath:$(root)/libmysql/.libs >>$@
-endif
-
-$(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l.cpp-options:
-	@ln -s $(root)/include $(dcf_root)/import/libmysqlclient_r/mysql
-	@echo include: -I$(dcf_root)/import/libmysqlclient_r >$@
-
-ifndef %foreign%
-
-disfigure::
-	$(call message,rm $(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l,\
-rm -f $(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l)
-	$(call message,,rm -f $(dcf_root)/import/libmysqlclient_r/mysql)
-	$(call message,,rm -f $(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l.cpp-options)
-
-endif
diff --git a/build/import/libmysqlclient_r/stub.make b/build/import/libmysqlclient_r/stub.make
deleted file mode 100644
index c0a9bc4..0000000
--- a/build/import/libmysqlclient_r/stub.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# file      : build/import/libmysqlclient_r/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libmysqlclient_r/configuration-rules.make,$(dcf_root))
-
-libmysqlclient_r_installed :=
-
-$(call -include,$(dcf_root)/import/libmysqlclient_r/configuration-dynamic.make)
-
-ifdef libmysqlclient_r_installed
-
-ifeq ($(libmysqlclient_r_installed),y)
-
-$(call export,l: -lmysqlclient_r,cpp-options: )
-
-else
-
-$(call include-once,$(scf_root)/import/libmysqlclient_r/rules.make,$(dcf_root))
-
-$(call export,\
-  l: $(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l,\
-  cpp-options: $(dcf_root)/import/libmysqlclient_r/mysqlclient_r.l.cpp-options)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libmysqlclient_r/version b/build/import/libmysqlclient_r/version
deleted file mode 100644
index 6e8bf73..0000000
--- a/build/import/libmysqlclient_r/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.0
diff --git a/build/import/libodb-mysql/configuration-rules.make b/build/import/libodb-mysql/configuration-rules.make
deleted file mode 100644
index 384d3d4..0000000
--- a/build/import/libodb-mysql/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libodb-mysql/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libodb-mysql/configuration-dynamic.make: | $(dcf_root)/import/libodb-mysql/.
-	$(call message,,$(scf_root)/import/libodb-mysql/configure $@)
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/import/libodb-mysql/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libodb-mysql/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libodb-mysql/configure b/build/import/libodb-mysql/configure
deleted file mode 100755
index 2a1fa8d..0000000
--- a/build/import/libodb-mysql/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libodb-mysql/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libodb-mysql' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed version"
-$echo "of 'libodb-mysql' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'libodb-mysql'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'libodb-mysql'."
-$echo
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo libodb_mysql_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/libodb-mysql/stub.make b/build/import/libodb-mysql/stub.make
deleted file mode 100644
index 1b1ecbb..0000000
--- a/build/import/libodb-mysql/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/libodb-mysql/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libodb-mysql/configuration-rules.make,$(dcf_root))
-
-libodb_mysql_installed :=
-
-$(call -include,$(dcf_root)/import/libodb-mysql/configuration-dynamic.make)
-
-ifdef libodb_mysql_installed
-
-ifeq ($(libodb_mysql_installed),y)
-
-$(call export,l: -lodb-mysql -lodb -lmysqlclient_r,cpp-options: )
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/libodb-mysql/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/build/import/libodb/configuration-rules.make b/build/import/libodb/configuration-rules.make
deleted file mode 100644
index 340c418..0000000
--- a/build/import/libodb/configuration-rules.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# file      : build/import/libodb/configuration-rules.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(dcf_root)/import/libodb/configuration-dynamic.make: | $(dcf_root)/import/libodb/.
-	$(call message,,$(scf_root)/import/libodb/configure $@)
-
-ifndef %foreign%
-
-$(dcf_root)/.disfigure::
-	$(call message,rm $(dcf_root)/import/libodb/configuration-dynamic.make,\
-rm -f $(dcf_root)/import/libodb/configuration-dynamic.make)
-
-endif
diff --git a/build/import/libodb/configure b/build/import/libodb/configure
deleted file mode 100755
index 261a202..0000000
--- a/build/import/libodb/configure
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /usr/bin/env bash
-
-# file      : build/import/libodb/configure
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-
-# $1           - out file
-#
-# bld_root     - build root
-# project_name - project name
-#
-
-source $bld_root/dialog.bash
-
-
-$echo
-$echo "Configuring external dependency on 'libodb' for '$project_name'."
-$echo
-
-$echo
-$echo "Would you like to configure dependency on the installed "
-$echo "version of 'libodb' as opposed to the development build?"
-$echo
-
-installed=`read_y_n y`
-
-path=
-
-if [ "$installed" = "n" ]; then
-
-$echo
-$echo "Please enter the src_root for 'libodb'."
-$echo
-
-src_root=`read_path --directory --exist`
-
-$echo
-$echo "Please enter the out_root for 'libodb'."
-$echo
-
-out_root=`read_path --directory $src_root`
-
-fi
-
-echo libodb_installed := $installed   >$1
-
-if [ "$installed" = "n" ]; then
-
-echo src_root := $src_root            >>$1
-echo scf_root := \$\(src_root\)/build >>$1
-echo out_root := $out_root            >>$1
-
-fi
diff --git a/build/import/libodb/stub.make b/build/import/libodb/stub.make
deleted file mode 100644
index 04dc786..0000000
--- a/build/import/libodb/stub.make
+++ /dev/null
@@ -1,28 +0,0 @@
-# file      : build/import/libodb/stub.make
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-$(call include-once,$(scf_root)/import/libodb/configuration-rules.make,$(dcf_root))
-
-libodb_installed :=
-
-$(call -include,$(dcf_root)/import/libodb/configuration-dynamic.make)
-
-ifdef libodb_installed
-
-ifeq ($(libodb_installed),y)
-
-$(call export,l: -lodb,cpp-options: )
-
-else
-
-# Include export stub.
-#
-$(call include,$(scf_root)/export/libodb/stub.make)
-
-endif
-
-else
-
-.NOTPARALLEL:
-
-endif
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 143d8bf..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,71 +0,0 @@
-# file      : configure.ac
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-AC_PREREQ(2.60)
-AC_INIT([libodb-mysql], [__value__(version)], [odb-users@codesynthesis.com])
-AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([odb/mysql/version.hxx])
-
-AM_INIT_AUTOMAKE([-Wall -Werror foreign nostdinc subdir-objects dist-bzip2 dist-zip tar-ustar])
-m4_equote()[m4_ifdef]m4_dquote()([AM_PROG_AR], [AM_PROG_AR]) # Required by automake 1.12.
-
-LT_INIT([win32-dll])
-
-AC_CANONICAL_HOST
-
-# Check for C++ compiler and use it to compile the tests.
-#
-AC_PROG_CXX
-AC_LANG(C++)
-
-# Create the libtool executable so that we can use it in further tests.
-#
-LT_OUTPUT
-
-# Check for threads.
-#
-THREADS
-
-# Check for libmysqlclient.
-#
-LIBMYSQLCLIENT(
-  [$threads],
-  [],
-  [AC_MSG_ERROR([lib$libmysqlclient_name is not found; consider using CPPFLAGS/LDFLAGS to specify its location])])
-
-case $libmysqlclient_include in
-  short)
-    AC_DEFINE([LIBODB_MYSQL_INCLUDE_SHORT], [1], ["Short MySQL include."])
-    ;;
-  long)
-    AC_DEFINE([LIBODB_MYSQL_INCLUDE_LONG], [1], ["Long MySQL include."])
-    ;;
-esac
-
-if test x"$libmysqlclient_thr_key_visible" = xyes; then
-  AC_DEFINE([LIBODB_MYSQL_THR_KEY_VISIBLE], [1], ["THR_KEY_mysys is visible."])
-fi
-
-# Check for libodb.
-#
-LIBODB([],[AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])])
-
-# Define LIBODB_MYSQL_STATIC_LIB if we are build static library on certain
-# platforms.
-#
-STATIC_LIB([LIBODB_MYSQL_STATIC_LIB], [Static library interface.])
-
-# Allow the user to specify the pkgconfig directory.
-#
-PKGCONFIG
-
-# Check if we should disable rpath.
-#
-DISABLE_RPATH
-
-# Output.
-#
-AC_CONFIG_HEADERS([odb/mysql/config.h odb/mysql/details/config.h])
-AC_CONFIG_FILES([__path__(config_files)])
-AC_OUTPUT
diff --git a/libodb-mysql-vc10.sln b/libodb-mysql-vc10.sln
deleted file mode 100644
index 1f9129b..0000000
--- a/libodb-mysql-vc10.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-mysql", "odb\mysql\libodb-mysql-vc10.vcxproj", "{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.Build.0 = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.ActiveCfg = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.Build.0 = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.ActiveCfg = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.Build.0 = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.ActiveCfg = Release|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-mysql-vc11.sln b/libodb-mysql-vc11.sln
deleted file mode 100644
index cd98807..0000000
--- a/libodb-mysql-vc11.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2012

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-mysql", "odb\mysql\libodb-mysql-vc11.vcxproj", "{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.Build.0 = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.ActiveCfg = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.Build.0 = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.ActiveCfg = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.Build.0 = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.ActiveCfg = Release|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-mysql-vc12.sln b/libodb-mysql-vc12.sln
deleted file mode 100644
index e3845a8..0000000
--- a/libodb-mysql-vc12.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
-MinimumVisualStudioVersion = 10.0.40219.1

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-mysql", "odb\mysql\libodb-mysql-vc12.vcxproj", "{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|Win32.Build.0 = Debug|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.ActiveCfg = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Debug|x64.Build.0 = Debug|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.ActiveCfg = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|Win32.Build.0 = Release|Win32

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.ActiveCfg = Release|x64

-		{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-mysql-vc8.sln b/libodb-mysql-vc8.sln
deleted file mode 100644
index c0c3e34..0000000
--- a/libodb-mysql-vc8.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-mysql", "odb\mysql\libodb-mysql-vc8.vcproj", "{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|Win32.Build.0 = Debug|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|x64.ActiveCfg = Debug|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|x64.Build.0 = Debug|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|Win32.ActiveCfg = Release|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|Win32.Build.0 = Release|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|x64.ActiveCfg = Release|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-mysql-vc9.sln b/libodb-mysql-vc9.sln
deleted file mode 100644
index 1999291..0000000
--- a/libodb-mysql-vc9.sln
+++ /dev/null
@@ -1,26 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb-mysql", "odb\mysql\libodb-mysql-vc9.vcproj", "{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|Win32.Build.0 = Debug|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|x64.ActiveCfg = Debug|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Debug|x64.Build.0 = Debug|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|Win32.ActiveCfg = Release|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|Win32.Build.0 = Release|Win32

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|x64.ActiveCfg = Release|x64

-		{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/libodb-mysql.pc.in b/libodb-mysql.pc.in
deleted file mode 100644
index f6bb067..0000000
--- a/libodb-mysql.pc.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# file      : libodb-mysql.pc.in
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libodb-mysql
-Description: Object-relational mapping (ORM) system for C++, MySQL runtime library
-URL: http://www.codesynthesis.com/products/odb/
-Version: @VERSION@
-Libs: -L${libdir} -lodb-mysql
-Cflags: -I${includedir}
diff --git a/libodb-mysql/.gitignore b/libodb-mysql/.gitignore
new file mode 100644
index 0000000..1c363a0
--- /dev/null
+++ b/libodb-mysql/.gitignore
@@ -0,0 +1,25 @@
+# Compiler/linker output.
+#
+*.d
+*.t
+*.i
+*.i.*
+*.ii
+*.ii.*
+*.o
+*.obj
+*.gcm
+*.pcm
+*.ifc
+*.so
+*.dylib
+*.dll
+*.a
+*.lib
+*.exp
+*.pdb
+*.ilk
+*.exe
+*.exe.dlls/
+*.exe.manifest
+*.pc
diff --git a/GPLv2 b/libodb-mysql/GPLv2
index 3912109..3912109 100644
--- a/GPLv2
+++ b/libodb-mysql/GPLv2
diff --git a/libodb-mysql/INSTALL b/libodb-mysql/INSTALL
new file mode 100644
index 0000000..ef46275
--- /dev/null
+++ b/libodb-mysql/INSTALL
@@ -0,0 +1,6 @@
+The easiest way to build this package is with the bpkg package manager:
+
+$ bpkg build libodb-mysql
+
+But if you don't want to use the package manager, then you can also build it
+manually using the standard build2 build system.
diff --git a/LICENSE b/libodb-mysql/LICENSE
index 9d92da1..9d92da1 100644
--- a/LICENSE
+++ b/libodb-mysql/LICENSE
diff --git a/README b/libodb-mysql/README
index 5e2315a..5e2315a 100644
--- a/README
+++ b/libodb-mysql/README
diff --git a/build/.gitignore b/libodb-mysql/build/.gitignore
index 4a730a3..4a730a3 100644
--- a/build/.gitignore
+++ b/libodb-mysql/build/.gitignore
diff --git a/build/bootstrap.build b/libodb-mysql/build/bootstrap.build
index fb04583..fb04583 100644
--- a/build/bootstrap.build
+++ b/libodb-mysql/build/bootstrap.build
diff --git a/build/export.build b/libodb-mysql/build/export.build
index 459f96d..459f96d 100644
--- a/build/export.build
+++ b/libodb-mysql/build/export.build
diff --git a/build/root.build b/libodb-mysql/build/root.build
index c98d520..c98d520 100644
--- a/build/root.build
+++ b/libodb-mysql/build/root.build
diff --git a/buildfile b/libodb-mysql/buildfile
index 406853f..a04e206 100644
--- a/buildfile
+++ b/libodb-mysql/buildfile
@@ -1,7 +1,7 @@
 # file      : buildfile
 # license   : GNU GPL v2; see accompanying LICENSE file
 
-./: {*/ -build/ -m4/} doc{INSTALL NEWS README} legal{GPLv2 LICENSE} manifest
+./: {*/ -build/} doc{INSTALL NEWS README} legal{GPLv2 LICENSE} manifest
 
 # Don't install tests or the INSTALL file.
 #
diff --git a/manifest b/libodb-mysql/manifest
index 238b329..238b329 100644
--- a/manifest
+++ b/libodb-mysql/manifest
diff --git a/odb/mysql/auto-handle.hxx b/libodb-mysql/odb/mysql/auto-handle.hxx
index 27e9f2b..27e9f2b 100644
--- a/odb/mysql/auto-handle.hxx
+++ b/libodb-mysql/odb/mysql/auto-handle.hxx
diff --git a/odb/mysql/binding.hxx b/libodb-mysql/odb/mysql/binding.hxx
index 628233d..628233d 100644
--- a/odb/mysql/binding.hxx
+++ b/libodb-mysql/odb/mysql/binding.hxx
diff --git a/odb/mysql/buildfile b/libodb-mysql/odb/mysql/buildfile
index 8fc2358..8fc2358 100644
--- a/odb/mysql/buildfile
+++ b/libodb-mysql/odb/mysql/buildfile
diff --git a/odb/mysql/connection-factory.cxx b/libodb-mysql/odb/mysql/connection-factory.cxx
index d53a4f4..d53a4f4 100644
--- a/odb/mysql/connection-factory.cxx
+++ b/libodb-mysql/odb/mysql/connection-factory.cxx
diff --git a/odb/mysql/connection-factory.hxx b/libodb-mysql/odb/mysql/connection-factory.hxx
index 12bd4d2..12bd4d2 100644
--- a/odb/mysql/connection-factory.hxx
+++ b/libodb-mysql/odb/mysql/connection-factory.hxx
diff --git a/odb/mysql/connection.cxx b/libodb-mysql/odb/mysql/connection.cxx
index 96baf3e..96baf3e 100644
--- a/odb/mysql/connection.cxx
+++ b/libodb-mysql/odb/mysql/connection.cxx
diff --git a/odb/mysql/connection.hxx b/libodb-mysql/odb/mysql/connection.hxx
index 31b24ed..31b24ed 100644
--- a/odb/mysql/connection.hxx
+++ b/libodb-mysql/odb/mysql/connection.hxx
diff --git a/odb/mysql/connection.ixx b/libodb-mysql/odb/mysql/connection.ixx
index d2f09ac..d2f09ac 100644
--- a/odb/mysql/connection.ixx
+++ b/libodb-mysql/odb/mysql/connection.ixx
diff --git a/odb/mysql/container-statements.hxx b/libodb-mysql/odb/mysql/container-statements.hxx
index 48e769d..48e769d 100644
--- a/odb/mysql/container-statements.hxx
+++ b/libodb-mysql/odb/mysql/container-statements.hxx
diff --git a/odb/mysql/container-statements.txx b/libodb-mysql/odb/mysql/container-statements.txx
index 55bc5fe..55bc5fe 100644
--- a/odb/mysql/container-statements.txx
+++ b/libodb-mysql/odb/mysql/container-statements.txx
diff --git a/odb/mysql/database.cxx b/libodb-mysql/odb/mysql/database.cxx
index 6c0f1d6..6c0f1d6 100644
--- a/odb/mysql/database.cxx
+++ b/libodb-mysql/odb/mysql/database.cxx
diff --git a/odb/mysql/database.hxx b/libodb-mysql/odb/mysql/database.hxx
index e73b7c9..e73b7c9 100644
--- a/odb/mysql/database.hxx
+++ b/libodb-mysql/odb/mysql/database.hxx
diff --git a/odb/mysql/database.ixx b/libodb-mysql/odb/mysql/database.ixx
index f9b62dd..f9b62dd 100644
--- a/odb/mysql/database.ixx
+++ b/libodb-mysql/odb/mysql/database.ixx
diff --git a/odb/mysql/details/build2/config-stub.h b/libodb-mysql/odb/mysql/details/build2/config-stub.h
index d9d08eb..d9d08eb 100644
--- a/odb/mysql/details/build2/config-stub.h
+++ b/libodb-mysql/odb/mysql/details/build2/config-stub.h
diff --git a/odb/mysql/details/build2/config-vc-stub.h b/libodb-mysql/odb/mysql/details/build2/config-vc-stub.h
index e22c7c2..e22c7c2 100644
--- a/odb/mysql/details/build2/config-vc-stub.h
+++ b/libodb-mysql/odb/mysql/details/build2/config-vc-stub.h
diff --git a/odb/mysql/details/build2/config-vc.h b/libodb-mysql/odb/mysql/details/build2/config-vc.h
index 3adb630..3adb630 100644
--- a/odb/mysql/details/build2/config-vc.h
+++ b/libodb-mysql/odb/mysql/details/build2/config-vc.h
diff --git a/odb/mysql/details/build2/config.h b/libodb-mysql/odb/mysql/details/build2/config.h
index ef6a60f..ef6a60f 100644
--- a/odb/mysql/details/build2/config.h
+++ b/libodb-mysql/odb/mysql/details/build2/config.h
diff --git a/odb/mysql/details/config-vc.h b/libodb-mysql/odb/mysql/details/config-vc.h
index fb01864..fb01864 100644
--- a/odb/mysql/details/config-vc.h
+++ b/libodb-mysql/odb/mysql/details/config-vc.h
diff --git a/odb/mysql/details/config.h.in b/libodb-mysql/odb/mysql/details/config.h.in
index 3b7869b..3b7869b 100644
--- a/odb/mysql/details/config.h.in
+++ b/libodb-mysql/odb/mysql/details/config.h.in
diff --git a/odb/mysql/details/config.hxx b/libodb-mysql/odb/mysql/details/config.hxx
index eeeee5c..eeeee5c 100644
--- a/odb/mysql/details/config.hxx
+++ b/libodb-mysql/odb/mysql/details/config.hxx
diff --git a/odb/mysql/details/conversion.hxx b/libodb-mysql/odb/mysql/details/conversion.hxx
index 5d1f575..5d1f575 100644
--- a/odb/mysql/details/conversion.hxx
+++ b/libodb-mysql/odb/mysql/details/conversion.hxx
diff --git a/odb/mysql/details/export.hxx b/libodb-mysql/odb/mysql/details/export.hxx
index e7c3871..e7c3871 100644
--- a/odb/mysql/details/export.hxx
+++ b/libodb-mysql/odb/mysql/details/export.hxx
diff --git a/odb/mysql/details/options.cli b/libodb-mysql/odb/mysql/details/options.cli
index 845c292..845c292 100644
--- a/odb/mysql/details/options.cli
+++ b/libodb-mysql/odb/mysql/details/options.cli
diff --git a/odb/mysql/details/pregenerated/odb/mysql/details/options.cxx b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.cxx
index 1e15af6..1e15af6 100644
--- a/odb/mysql/details/pregenerated/odb/mysql/details/options.cxx
+++ b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.cxx
diff --git a/odb/mysql/details/pregenerated/odb/mysql/details/options.hxx b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.hxx
index daa7d52..daa7d52 100644
--- a/odb/mysql/details/pregenerated/odb/mysql/details/options.hxx
+++ b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.hxx
diff --git a/odb/mysql/details/pregenerated/odb/mysql/details/options.ixx b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.ixx
index 66bc5df..66bc5df 100644
--- a/odb/mysql/details/pregenerated/odb/mysql/details/options.ixx
+++ b/libodb-mysql/odb/mysql/details/pregenerated/odb/mysql/details/options.ixx
diff --git a/odb/mysql/enum.cxx b/libodb-mysql/odb/mysql/enum.cxx
index 1e53b29..1e53b29 100644
--- a/odb/mysql/enum.cxx
+++ b/libodb-mysql/odb/mysql/enum.cxx
diff --git a/odb/mysql/enum.hxx b/libodb-mysql/odb/mysql/enum.hxx
index da0436d..da0436d 100644
--- a/odb/mysql/enum.hxx
+++ b/libodb-mysql/odb/mysql/enum.hxx
diff --git a/odb/mysql/error.cxx b/libodb-mysql/odb/mysql/error.cxx
index 26380ec..26380ec 100644
--- a/odb/mysql/error.cxx
+++ b/libodb-mysql/odb/mysql/error.cxx
diff --git a/odb/mysql/error.hxx b/libodb-mysql/odb/mysql/error.hxx
index 0893841..0893841 100644
--- a/odb/mysql/error.hxx
+++ b/libodb-mysql/odb/mysql/error.hxx
diff --git a/odb/mysql/exceptions.cxx b/libodb-mysql/odb/mysql/exceptions.cxx
index b15d316..b15d316 100644
--- a/odb/mysql/exceptions.cxx
+++ b/libodb-mysql/odb/mysql/exceptions.cxx
diff --git a/odb/mysql/exceptions.hxx b/libodb-mysql/odb/mysql/exceptions.hxx
index 5e9f9f1..5e9f9f1 100644
--- a/odb/mysql/exceptions.hxx
+++ b/libodb-mysql/odb/mysql/exceptions.hxx
diff --git a/odb/mysql/forward.hxx b/libodb-mysql/odb/mysql/forward.hxx
index 243c94e..243c94e 100644
--- a/odb/mysql/forward.hxx
+++ b/libodb-mysql/odb/mysql/forward.hxx
diff --git a/odb/mysql/mysql-types.hxx b/libodb-mysql/odb/mysql/mysql-types.hxx
index af7135b..af7135b 100644
--- a/odb/mysql/mysql-types.hxx
+++ b/libodb-mysql/odb/mysql/mysql-types.hxx
diff --git a/odb/mysql/mysql.hxx b/libodb-mysql/odb/mysql/mysql.hxx
index 38fdd62..38fdd62 100644
--- a/odb/mysql/mysql.hxx
+++ b/libodb-mysql/odb/mysql/mysql.hxx
diff --git a/odb/mysql/no-id-object-result.hxx b/libodb-mysql/odb/mysql/no-id-object-result.hxx
index 7a38120..7a38120 100644
--- a/odb/mysql/no-id-object-result.hxx
+++ b/libodb-mysql/odb/mysql/no-id-object-result.hxx
diff --git a/odb/mysql/no-id-object-result.txx b/libodb-mysql/odb/mysql/no-id-object-result.txx
index 21168b9..21168b9 100644
--- a/odb/mysql/no-id-object-result.txx
+++ b/libodb-mysql/odb/mysql/no-id-object-result.txx
diff --git a/odb/mysql/no-id-object-statements.hxx b/libodb-mysql/odb/mysql/no-id-object-statements.hxx
index b554b72..b554b72 100644
--- a/odb/mysql/no-id-object-statements.hxx
+++ b/libodb-mysql/odb/mysql/no-id-object-statements.hxx
diff --git a/odb/mysql/no-id-object-statements.txx b/libodb-mysql/odb/mysql/no-id-object-statements.txx
index 5917461..5917461 100644
--- a/odb/mysql/no-id-object-statements.txx
+++ b/libodb-mysql/odb/mysql/no-id-object-statements.txx
diff --git a/odb/mysql/polymorphic-object-result.hxx b/libodb-mysql/odb/mysql/polymorphic-object-result.hxx
index 1ccc313..1ccc313 100644
--- a/odb/mysql/polymorphic-object-result.hxx
+++ b/libodb-mysql/odb/mysql/polymorphic-object-result.hxx
diff --git a/odb/mysql/polymorphic-object-result.txx b/libodb-mysql/odb/mysql/polymorphic-object-result.txx
index e587f6f..e587f6f 100644
--- a/odb/mysql/polymorphic-object-result.txx
+++ b/libodb-mysql/odb/mysql/polymorphic-object-result.txx
diff --git a/odb/mysql/polymorphic-object-statements.hxx b/libodb-mysql/odb/mysql/polymorphic-object-statements.hxx
index 0eacac4..0eacac4 100644
--- a/odb/mysql/polymorphic-object-statements.hxx
+++ b/libodb-mysql/odb/mysql/polymorphic-object-statements.hxx
diff --git a/odb/mysql/polymorphic-object-statements.txx b/libodb-mysql/odb/mysql/polymorphic-object-statements.txx
index 5899bc0..5899bc0 100644
--- a/odb/mysql/polymorphic-object-statements.txx
+++ b/libodb-mysql/odb/mysql/polymorphic-object-statements.txx
diff --git a/odb/mysql/prepared-query.cxx b/libodb-mysql/odb/mysql/prepared-query.cxx
index 498d147..498d147 100644
--- a/odb/mysql/prepared-query.cxx
+++ b/libodb-mysql/odb/mysql/prepared-query.cxx
diff --git a/odb/mysql/prepared-query.hxx b/libodb-mysql/odb/mysql/prepared-query.hxx
index d892fec..d892fec 100644
--- a/odb/mysql/prepared-query.hxx
+++ b/libodb-mysql/odb/mysql/prepared-query.hxx
diff --git a/odb/mysql/query-const-expr.cxx b/libodb-mysql/odb/mysql/query-const-expr.cxx
index 4c1dd37..4c1dd37 100644
--- a/odb/mysql/query-const-expr.cxx
+++ b/libodb-mysql/odb/mysql/query-const-expr.cxx
diff --git a/odb/mysql/query-dynamic.cxx b/libodb-mysql/odb/mysql/query-dynamic.cxx
index 89041ca..89041ca 100644
--- a/odb/mysql/query-dynamic.cxx
+++ b/libodb-mysql/odb/mysql/query-dynamic.cxx
diff --git a/odb/mysql/query-dynamic.hxx b/libodb-mysql/odb/mysql/query-dynamic.hxx
index f6a571f..f6a571f 100644
--- a/odb/mysql/query-dynamic.hxx
+++ b/libodb-mysql/odb/mysql/query-dynamic.hxx
diff --git a/odb/mysql/query-dynamic.ixx b/libodb-mysql/odb/mysql/query-dynamic.ixx
index f9f3984..f9f3984 100644
--- a/odb/mysql/query-dynamic.ixx
+++ b/libodb-mysql/odb/mysql/query-dynamic.ixx
diff --git a/odb/mysql/query-dynamic.txx b/libodb-mysql/odb/mysql/query-dynamic.txx
index 52e653b..52e653b 100644
--- a/odb/mysql/query-dynamic.txx
+++ b/libodb-mysql/odb/mysql/query-dynamic.txx
diff --git a/odb/mysql/query.cxx b/libodb-mysql/odb/mysql/query.cxx
index a420495..a420495 100644
--- a/odb/mysql/query.cxx
+++ b/libodb-mysql/odb/mysql/query.cxx
diff --git a/odb/mysql/query.hxx b/libodb-mysql/odb/mysql/query.hxx
index d0972c9..d0972c9 100644
--- a/odb/mysql/query.hxx
+++ b/libodb-mysql/odb/mysql/query.hxx
diff --git a/odb/mysql/query.ixx b/libodb-mysql/odb/mysql/query.ixx
index ea1ec03..ea1ec03 100644
--- a/odb/mysql/query.ixx
+++ b/libodb-mysql/odb/mysql/query.ixx
diff --git a/odb/mysql/query.txx b/libodb-mysql/odb/mysql/query.txx
index e09ed85..e09ed85 100644
--- a/odb/mysql/query.txx
+++ b/libodb-mysql/odb/mysql/query.txx
diff --git a/odb/mysql/section-statements.hxx b/libodb-mysql/odb/mysql/section-statements.hxx
index a88683f..a88683f 100644
--- a/odb/mysql/section-statements.hxx
+++ b/libodb-mysql/odb/mysql/section-statements.hxx
diff --git a/odb/mysql/section-statements.txx b/libodb-mysql/odb/mysql/section-statements.txx
index 5c0672e..5c0672e 100644
--- a/odb/mysql/section-statements.txx
+++ b/libodb-mysql/odb/mysql/section-statements.txx
diff --git a/odb/mysql/simple-object-result.hxx b/libodb-mysql/odb/mysql/simple-object-result.hxx
index ae0848c..ae0848c 100644
--- a/odb/mysql/simple-object-result.hxx
+++ b/libodb-mysql/odb/mysql/simple-object-result.hxx
diff --git a/odb/mysql/simple-object-result.txx b/libodb-mysql/odb/mysql/simple-object-result.txx
index 5c6e198..5c6e198 100644
--- a/odb/mysql/simple-object-result.txx
+++ b/libodb-mysql/odb/mysql/simple-object-result.txx
diff --git a/odb/mysql/simple-object-statements.cxx b/libodb-mysql/odb/mysql/simple-object-statements.cxx
index af0df6b..af0df6b 100644
--- a/odb/mysql/simple-object-statements.cxx
+++ b/libodb-mysql/odb/mysql/simple-object-statements.cxx
diff --git a/odb/mysql/simple-object-statements.hxx b/libodb-mysql/odb/mysql/simple-object-statements.hxx
index 5292b66..5292b66 100644
--- a/odb/mysql/simple-object-statements.hxx
+++ b/libodb-mysql/odb/mysql/simple-object-statements.hxx
diff --git a/odb/mysql/simple-object-statements.ixx b/libodb-mysql/odb/mysql/simple-object-statements.ixx
index a75fc0d..a75fc0d 100644
--- a/odb/mysql/simple-object-statements.ixx
+++ b/libodb-mysql/odb/mysql/simple-object-statements.ixx
diff --git a/odb/mysql/simple-object-statements.txx b/libodb-mysql/odb/mysql/simple-object-statements.txx
index 2c04c71..2c04c71 100644
--- a/odb/mysql/simple-object-statements.txx
+++ b/libodb-mysql/odb/mysql/simple-object-statements.txx
diff --git a/odb/mysql/statement-cache.hxx b/libodb-mysql/odb/mysql/statement-cache.hxx
index 1b62864..1b62864 100644
--- a/odb/mysql/statement-cache.hxx
+++ b/libodb-mysql/odb/mysql/statement-cache.hxx
diff --git a/odb/mysql/statement-cache.txx b/libodb-mysql/odb/mysql/statement-cache.txx
index c134f8d..c134f8d 100644
--- a/odb/mysql/statement-cache.txx
+++ b/libodb-mysql/odb/mysql/statement-cache.txx
diff --git a/odb/mysql/statement.cxx b/libodb-mysql/odb/mysql/statement.cxx
index 83f294a..83f294a 100644
--- a/odb/mysql/statement.cxx
+++ b/libodb-mysql/odb/mysql/statement.cxx
diff --git a/odb/mysql/statement.hxx b/libodb-mysql/odb/mysql/statement.hxx
index b1465ea..b1465ea 100644
--- a/odb/mysql/statement.hxx
+++ b/libodb-mysql/odb/mysql/statement.hxx
diff --git a/odb/mysql/statements-base.cxx b/libodb-mysql/odb/mysql/statements-base.cxx
index 3e1bcc6..3e1bcc6 100644
--- a/odb/mysql/statements-base.cxx
+++ b/libodb-mysql/odb/mysql/statements-base.cxx
diff --git a/odb/mysql/statements-base.hxx b/libodb-mysql/odb/mysql/statements-base.hxx
index 93e72d2..93e72d2 100644
--- a/odb/mysql/statements-base.hxx
+++ b/libodb-mysql/odb/mysql/statements-base.hxx
diff --git a/odb/mysql/tracer.cxx b/libodb-mysql/odb/mysql/tracer.cxx
index da39633..da39633 100644
--- a/odb/mysql/tracer.cxx
+++ b/libodb-mysql/odb/mysql/tracer.cxx
diff --git a/odb/mysql/tracer.hxx b/libodb-mysql/odb/mysql/tracer.hxx
index 03ca6df..03ca6df 100644
--- a/odb/mysql/tracer.hxx
+++ b/libodb-mysql/odb/mysql/tracer.hxx
diff --git a/odb/mysql/traits-calls.hxx b/libodb-mysql/odb/mysql/traits-calls.hxx
index f6b2ab6..f6b2ab6 100644
--- a/odb/mysql/traits-calls.hxx
+++ b/libodb-mysql/odb/mysql/traits-calls.hxx
diff --git a/odb/mysql/traits.cxx b/libodb-mysql/odb/mysql/traits.cxx
index 9fbdbb4..9fbdbb4 100644
--- a/odb/mysql/traits.cxx
+++ b/libodb-mysql/odb/mysql/traits.cxx
diff --git a/odb/mysql/traits.hxx b/libodb-mysql/odb/mysql/traits.hxx
index e76f7e7..e76f7e7 100644
--- a/odb/mysql/traits.hxx
+++ b/libodb-mysql/odb/mysql/traits.hxx
diff --git a/odb/mysql/transaction-impl.cxx b/libodb-mysql/odb/mysql/transaction-impl.cxx
index 0ca1546..0ca1546 100644
--- a/odb/mysql/transaction-impl.cxx
+++ b/libodb-mysql/odb/mysql/transaction-impl.cxx
diff --git a/odb/mysql/transaction-impl.hxx b/libodb-mysql/odb/mysql/transaction-impl.hxx
index d87ad35..d87ad35 100644
--- a/odb/mysql/transaction-impl.hxx
+++ b/libodb-mysql/odb/mysql/transaction-impl.hxx
diff --git a/odb/mysql/transaction.cxx b/libodb-mysql/odb/mysql/transaction.cxx
index 5d59fad..5d59fad 100644
--- a/odb/mysql/transaction.cxx
+++ b/libodb-mysql/odb/mysql/transaction.cxx
diff --git a/odb/mysql/transaction.hxx b/libodb-mysql/odb/mysql/transaction.hxx
index 0f5ae6f..0f5ae6f 100644
--- a/odb/mysql/transaction.hxx
+++ b/libodb-mysql/odb/mysql/transaction.hxx
diff --git a/odb/mysql/transaction.ixx b/libodb-mysql/odb/mysql/transaction.ixx
index 15af6a5..15af6a5 100644
--- a/odb/mysql/transaction.ixx
+++ b/libodb-mysql/odb/mysql/transaction.ixx
diff --git a/odb/mysql/version-build2-stub.hxx b/libodb-mysql/odb/mysql/version-build2-stub.hxx
index 72bb807..72bb807 100644
--- a/odb/mysql/version-build2-stub.hxx
+++ b/libodb-mysql/odb/mysql/version-build2-stub.hxx
diff --git a/odb/mysql/version-build2.hxx b/libodb-mysql/odb/mysql/version-build2.hxx
index e69de29..e69de29 100644
--- a/odb/mysql/version-build2.hxx
+++ b/libodb-mysql/odb/mysql/version-build2.hxx
diff --git a/odb/mysql/version-build2.hxx.in b/libodb-mysql/odb/mysql/version-build2.hxx.in
index 3db7601..3db7601 100644
--- a/odb/mysql/version-build2.hxx.in
+++ b/libodb-mysql/odb/mysql/version-build2.hxx.in
diff --git a/odb/mysql/version.hxx b/libodb-mysql/odb/mysql/version.hxx
index d778a10..d778a10 100644
--- a/odb/mysql/version.hxx
+++ b/libodb-mysql/odb/mysql/version.hxx
diff --git a/odb/mysql/view-result.hxx b/libodb-mysql/odb/mysql/view-result.hxx
index 2a7682b..2a7682b 100644
--- a/odb/mysql/view-result.hxx
+++ b/libodb-mysql/odb/mysql/view-result.hxx
diff --git a/odb/mysql/view-result.txx b/libodb-mysql/odb/mysql/view-result.txx
index c480920..c480920 100644
--- a/odb/mysql/view-result.txx
+++ b/libodb-mysql/odb/mysql/view-result.txx
diff --git a/odb/mysql/view-statements.hxx b/libodb-mysql/odb/mysql/view-statements.hxx
index cff4bc1..cff4bc1 100644
--- a/odb/mysql/view-statements.hxx
+++ b/libodb-mysql/odb/mysql/view-statements.hxx
diff --git a/odb/mysql/view-statements.txx b/libodb-mysql/odb/mysql/view-statements.txx
index b425227..b425227 100644
--- a/odb/mysql/view-statements.txx
+++ b/libodb-mysql/odb/mysql/view-statements.txx
diff --git a/tests/.gitignore b/libodb-mysql/tests/.gitignore
index e54525b..e54525b 100644
--- a/tests/.gitignore
+++ b/libodb-mysql/tests/.gitignore
diff --git a/tests/basics/buildfile b/libodb-mysql/tests/basics/buildfile
index 8899347..8899347 100644
--- a/tests/basics/buildfile
+++ b/libodb-mysql/tests/basics/buildfile
diff --git a/tests/basics/driver.cxx b/libodb-mysql/tests/basics/driver.cxx
index 81ebb19..81ebb19 100644
--- a/tests/basics/driver.cxx
+++ b/libodb-mysql/tests/basics/driver.cxx
diff --git a/tests/build/.gitignore b/libodb-mysql/tests/build/.gitignore
index 4a730a3..4a730a3 100644
--- a/tests/build/.gitignore
+++ b/libodb-mysql/tests/build/.gitignore
diff --git a/tests/build/bootstrap.build b/libodb-mysql/tests/build/bootstrap.build
index 6ee38db..6ee38db 100644
--- a/tests/build/bootstrap.build
+++ b/libodb-mysql/tests/build/bootstrap.build
diff --git a/tests/build/root.build b/libodb-mysql/tests/build/root.build
index 6c5a90b..6c5a90b 100644
--- a/tests/build/root.build
+++ b/libodb-mysql/tests/build/root.build
diff --git a/tests/buildfile b/libodb-mysql/tests/buildfile
index 57588a4..57588a4 100644
--- a/tests/buildfile
+++ b/libodb-mysql/tests/buildfile
diff --git a/m4/acx-pthread.m4 b/m4/acx-pthread.m4
deleted file mode 100644
index 204b32d..0000000
--- a/m4/acx-pthread.m4
+++ /dev/null
@@ -1,259 +0,0 @@
-dnl
-dnl NOTE: This file was modified. See the comments starting with 'CS:'
-dnl for more information. In particular, it was changed to use C++
-dnl instead of C.
-dnl
-dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl @summary figure out how to build C++ programs using POSIX threads
-dnl
-dnl This macro figures out how to build C++ programs using POSIX threads.
-dnl It sets the PTHREAD_LIBS output variable to the threads library and
-dnl linker flags, and the PTHREAD_CXXFLAGS output variable to any special
-dnl C++ compiler flags that are needed. (The user can also force certain
-dnl compiler flags/libs to be tested by setting these environment
-dnl variables.)
-dnl
-dnl Also sets PTHREAD_CXX to any special C++ compiler that is needed for
-dnl multi-threaded programs (defaults to the value of CXX otherwise).
-dnl (This is necessary on AIX to use the special xlC_r compiler alias.)
-dnl
-dnl NOTE: You are assumed to not only compile your program with these
-dnl flags, but also link it with them as well. e.g. you should link
-dnl with $PTHREAD_CXX $CXXFLAGS $PTHREAD_CXXFLAGS $LDFLAGS ... $PTHREAD_LIBS
-dnl $LIBS
-dnl
-dnl If you are only building threads programs, you may wish to use
-dnl these variables in your default LIBS, CXXFLAGS, and CXX:
-dnl
-dnl        LIBS="$PTHREAD_LIBS $LIBS"
-dnl        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-dnl        CXX="$PTHREAD_CXX"
-dnl
-dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
-dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
-dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-dnl
-dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
-dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
-dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
-dnl default action will define HAVE_PTHREAD.
-dnl
-dnl Please let the authors know if this macro fails on any platform, or
-dnl if you have any other suggestions or comments. This macro was based
-dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
-dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
-dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
-dnl We are also grateful for the helpful feedback of numerous users.
-dnl
-dnl @category InstalledPackages
-dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
-dnl @version 2006-05-29
-dnl @license GPLWithACException
-
-AC_DEFUN([ACX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_LANG_SAVE
-AC_LANG(C++)
-acx_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on True64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test x"$PTHREAD_LIBS$PTHREAD_CXXFLAGS" != x; then
-        save_CXXFLAGS="$CXXFLAGS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CXXFLAGS=$PTHREAD_CXXFLAGS])
-        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test x"$acx_pthread_ok" = xno; then
-                PTHREAD_LIBS=""
-                PTHREAD_CXXFLAGS=""
-        fi
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try.  Items starting with a "-" are
-# C compiler flags, and other items are library names, except for "none"
-# which indicates that we try without any flags at all, and "pthread-config"
-# which is a program returning the flags for the Pth emulation library.
-
-# CS: On GNU/Linux with gcc both -pthread and -lpthread are valid.
-# However, libtool links libraries with -nostdlib which results in
-# -pthread being stripped from the linker command line. To resolve
-# this we move pthread from after -mthreads to after pthreads.
-#
-acx_pthread_flags="pthreads pthread none -Kthread -kthread lthread -pthread -pthreads -mthreads --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-# -pthreads: Solaris/gcc
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads too;
-#      also defines -D_REENTRANT)
-#      ... -mt is also the pthreads flag for HP/aCC
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case "${host_cpu}-${host_os}" in
-        *solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-        # a function called by this macro, so we could check for that, but
-        # who knows whether they'll stub that too in a future libc.)  So,
-        # we'll just look for -pthreads and -lpthread first:
-
-        # CS: Move -mt to the front of the list; Sun CC will use -mt,
-        # gcc will use -pthreads.
-        #
-        acx_pthread_flags="-mt -pthreads pthread -pthread $acx_pthread_flags"
-        ;;
-esac
-
-if test x"$acx_pthread_ok" = xno; then
-for flag in $acx_pthread_flags; do
-
-        case $flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $flag])
-                PTHREAD_CXXFLAGS="$flag"
-                ;;
-
-		pthread-config)
-		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
-		if test x"$acx_pthread_config" = xno; then continue; fi
-		PTHREAD_CXXFLAGS="`pthread-config --cflags`"
-		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-		;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
-                PTHREAD_LIBS="-l$flag"
-                ;;
-        esac
-
-        save_LIBS="$LIBS"
-        save_CXXFLAGS="$CXXFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-        #
-        AC_TRY_LINK([#include <pthread.h>],
-                    [pthread_t th; pthread_join(th, 0);
-                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);],
-                    [acx_pthread_ok=yes])
-
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-
-        AC_MSG_RESULT($acx_pthread_ok)
-        if test "x$acx_pthread_ok" = xyes; then
-                break;
-        fi
-
-        PTHREAD_LIBS=""
-        PTHREAD_CXXFLAGS=""
-done
-fi
-
-# Various other checks:
-if test "x$acx_pthread_ok" = xyes; then
-        save_LIBS="$LIBS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        save_CXXFLAGS="$CXXFLAGS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-dnl     # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-dnl	AC_MSG_CHECKING([for joinable pthread attribute])
-dnl	attr_name=unknown
-dnl	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-dnl	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
-dnl                        [attr_name=$attr; break])
-dnl	done
-dnl     AC_MSG_RESULT($attr_name)
-dnl     if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-dnl         AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
-dnl                            [Define to necessary symbol if this constant
-dnl                             uses a non-standard name on your system.])
-dnl     fi
-
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
-        flag=no
-        case "${host_cpu}-${host_os}" in
-            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-            # CS: Add _REENTRANT in Linux to emulate -pthread.
-            #
-            *-linux* | *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-        esac
-        AC_MSG_RESULT(${flag})
-        if test "x$flag" != xno; then
-            PTHREAD_CXXFLAGS="$flag $PTHREAD_CXXFLAGS"
-        fi
-
-        LIBS="$save_LIBS"
-        CXXFLAGS="$save_CXXFLAGS"
-
-dnl     # More AIX lossage: must compile with xlC_r
-dnl	if test x"$GXX" != xyes; then
-dnl          AC_CHECK_PROGS(PTHREAD_CXX, xlC_r, ${CXX})
-dnl        else
-dnl          PTHREAD_CXX=$CXX
-dnl	fi
-
-else
-        PTHREAD_CXX="$CXX"
-fi
-
-AC_SUBST(PTHREAD_LIBS)
-AC_SUBST(PTHREAD_CXXFLAGS)
-AC_SUBST(PTHREAD_CXX)
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test x"$acx_pthread_ok" = xyes; then
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
-        :
-else
-        acx_pthread_ok=no
-        $2
-fi
-AC_LANG_RESTORE
-])dnl ACX_PTHREAD
diff --git a/m4/disable-rpath.m4 b/m4/disable-rpath.m4
deleted file mode 100644
index 0864209..0000000
--- a/m4/disable-rpath.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl file      : m4/disable-rpath.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([DISABLE_RPATH],[
-
-AC_MSG_CHECKING([whether to use rpath])
-AC_ARG_ENABLE(
-  [rpath],
-  [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])],
-  [libtool_rpath="$enable_rpath"],
-  [libtool_rpath="yes"])
-AC_MSG_RESULT($libtool_rpath)
-
-# Patch libtool to not use rpath if requested.
-#
-AC_CONFIG_COMMANDS(
-  [libtool-rpath-patch],
-  [if test "$libtool_use_rpath" = "no"; then
-     sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/'
-     mv libtool-2 libtool
-     chmod 755 libtool
-  fi],
-  [libtool_use_rpath=$libtool_rpath])
-])dnl
diff --git a/m4/libmysqlclient.m4 b/m4/libmysqlclient.m4
deleted file mode 100644
index 141d258..0000000
--- a/m4/libmysqlclient.m4
+++ /dev/null
@@ -1,128 +0,0 @@
-dnl file      : m4/libmysqlclient.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBMYSQLCLIENT(MULTI-THREADED=none|<other>,
-dnl                [ACTION-IF-FOUND[,
-dnl                ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBMYSQLCLIENT], [
-libmysqlclient_found=no
-
-if test x"$1" != xnone; then
-  libmysqlclient_name=mysqlclient_r
-else
-  libmysqlclient_name=mysqlclient
-fi
-
-AC_MSG_CHECKING([for lib$libmysqlclient_name])
-
-save_LIBS="$LIBS"
-LIBS="-l$libmysqlclient_name $LIBS"
-
-# Some distributions (e.g., Fedora) hide the library in the mysql/
-# subdirectory.
-#
-libmysqlclient_paths="none /usr/lib/mysql /usr/lib64/mysql"
-
-for path in $libmysqlclient_paths; do
-
-if test x"path" != xnone; then
-  save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS -L$path"
-fi
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#ifdef _WIN32
-#  include <winsock2.h>
-#endif
-#include <mysql/mysql.h>
-
-int
-main ()
-{
-  MYSQL handle;
-  mysql_init (&handle);
-  mysql_real_connect (&handle, 0, 0, 0, 0, 0, 0, 0);
-  MYSQL_STMT* stmt = mysql_stmt_init (&handle);
-  mysql_stmt_close (stmt);
-  mysql_close (&handle);
-}
-])],
-[
-libmysqlclient_found=yes
-libmysqlclient_include=long
-])
-
-if test x"$libmysqlclient_found" = xyes; then
-  break;
-fi
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#ifdef _WIN32
-#  include <winsock2.h>
-#endif
-#include <mysql.h>
-
-int
-main ()
-{
-  MYSQL handle;
-  mysql_init (&handle);
-  mysql_real_connect (&handle, 0, 0, 0, 0, 0, 0, 0);
-  MYSQL_STMT* stmt = mysql_stmt_init (&handle);
-  mysql_stmt_close (stmt);
-  mysql_close (&handle);
-}
-])],
-[
-libmysqlclient_found=yes
-libmysqlclient_include=short
-])
-
-if test x"$libmysqlclient_found" = xyes; then
-  break;
-fi
-
-if test x"path" != xnone; then
-  LDFLAGS="$save_LDFLAGS"
-fi
-
-done
-
-if test x"$libmysqlclient_found" = xno; then
-  LIBS="$save_LIBS"
-fi
-
-if test x"$libmysqlclient_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $2
-else
-  AC_MSG_RESULT([no])
-  $3
-fi
-
-# Check if the THR_KEY_mysys pthread key symbol is visible.
-#
-libmysqlclient_thr_key_visible=no
-
-if test x"$libmysqlclient_found" = xyes -a x"$1" = xposix; then
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <pthread.h>
-extern pthread_key_t THR_KEY_mysys;
-int
-main ()
-{
-  return pthread_getspecific (THR_KEY_mysys) != 0;
-}
-])],
-[
-libmysqlclient_thr_key_visible=yes
-])
-fi
-
-])dnl
diff --git a/m4/libodb.m4 b/m4/libodb.m4
deleted file mode 100644
index 0dba7c4..0000000
--- a/m4/libodb.m4
+++ /dev/null
@@ -1,81 +0,0 @@
-dnl file      : m4/libodb.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB], [
-libodb_found=no
-
-AC_ARG_WITH(
-  [libodb],
-  [AC_HELP_STRING([--with-libodb=DIR],[location of libodb build directory])],
-  [libodb_dir=${withval}],
-  [libodb_dir=])
-
-AC_MSG_CHECKING([for libodb])
-
-# If libodb_dir was given, add the necessary preprocessor and linker flags.
-#
-if test x"$libodb_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_dir], [$ac_pwd], [$libodb_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_dir/odb"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/exception.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_found=yes])
-
-if test x"$libodb_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libtool-link.m4 b/m4/libtool-link.m4
deleted file mode 100644
index 302639f..0000000
--- a/m4/libtool-link.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl file      : m4/libtool-link.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl
-dnl CXX_LIBTOOL_LINK_IFELSE (input, [action-if-true], [action-if-false])
-dnl
-dnl Similar to AC_LINK_IFELSE except it uses libtool to perform the
-dnl linking and it does this using the C++ compiler.
-dnl
-AC_DEFUN([CXX_LIBTOOL_LINK_IFELSE],[
-AC_LANG_SAVE
-AC_LANG(C++)
-
-if test -d .libs; then
-  delete_libs_dir=no
-else
-  delete_libs_dir=yes
-fi
-
-AC_COMPILE_IFELSE([$1],
-[
-  ac_try='./libtool --tag=CXX --mode=link $CXX -no-install $CXXFLAGS $LDFLAGS -o conftest conftest.$OBJEXT $LIBS >&AS_MESSAGE_LOG_FD'
-  if _AC_DO_VAR(ac_try); then
-    libtool_link_ok=yes
-  else
-    libtool_link_ok=no
-  fi
-],
-[
-  libtool_link_ok=no
-])
-
-if test x"$delete_libs_dir" = xyes; then
-  rm -rf .libs
-fi
-
-if test x"$libtool_link_ok" = xyes; then
-[$2]
-:
-else
-[$3]
-:
-fi
-
-AC_LANG_RESTORE])dnl
diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4
deleted file mode 100644
index c48ea56..0000000
--- a/m4/pkgconfig.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-dnl file      : m4/pkgconfig.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([PKGCONFIG],[
-AC_ARG_WITH(
-  [pkgconfigdir],
-  [AC_HELP_STRING([--with-pkgconfigdir=DIR],[location of pkgconfig dir (default is libdir/pkgconfig)])],
-  [pkgconfigdir=${withval}],
-  [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST([pkgconfigdir])
-])dnl
diff --git a/m4/static-lib.m4 b/m4/static-lib.m4
deleted file mode 100644
index 5fb1c11..0000000
--- a/m4/static-lib.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl file      : m4/static-lib.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl STATIC_LIB(MACRO, DESCRIPTION)
-dnl
-dnl Define MACRO if we are on MinGW and are only building static library.
-dnl
-AC_DEFUN([STATIC_LIB],
-[
-if test x$enable_shared = xno; then
-  case $host_os in
-    mingw*)
-      AC_DEFINE([$1], [1], [$2])
-      ;;
-  esac
-fi
-])dnl
diff --git a/m4/threads.m4 b/m4/threads.m4
deleted file mode 100644
index 6f2e25f..0000000
--- a/m4/threads.m4
+++ /dev/null
@@ -1,68 +0,0 @@
-dnl file      : m4/threads.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-AC_DEFUN([THREADS],[
-
-threads_thread_keyword=no
-
-AC_ARG_ENABLE(
-  [threads],
-  AS_HELP_STRING([--disable-threads], [disable threads (enabled by default)]),
-  [AS_IF([test x"$enableval" = xno], [threads=none], [threads=check])],
-  [threads=check])
-
-# If thread support is not disabled by the user, figure out what we can use.
-#
-if test x$threads = xcheck; then
-  case $host_os in
-    windows* | mingw*)
-      case $host_os in
-        mingw*)
-          CXXFLAGS="$CXXFLAGS -mthreads"
-          ;;
-      esac
-
-      # Newer versions of GCC can be configured to use either Win32 or POSIX
-      # threads. It appears that -mthreads should be used in both cases but
-      # if the model is POSIX then GCC will also link -lpthread by default.
-      # Use that fact to test which model we have.
-      #
-      AC_TRY_LINK([#include <pthread.h>],
-                  [pthread_create(0,0,0,0);],
-		  [threads=posix],
-                  [threads=win32])
-      ;;
-    *)
-      ACX_PTHREAD
-
-      if test x$acx_pthread_ok = xyes; then
-        threads=posix
-        LIBS="$LIBS $PTHREAD_LIBS"
-        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
-
-        # Check if we can use the __thread keyword.
-        #
-        AC_MSG_CHECKING([for __thread keyword])
-
-        CXX_LIBTOOL_LINK_IFELSE([
-          AC_LANG_SOURCE([
-            __thread int tls_var;
-
-            int
-            main ()
-            {
-              tls_var = 0;
-            }
-          ])],
-          [threads_thread_keyword=yes])
-
-        AC_MSG_RESULT([$threads_thread_keyword])
-      fi
-      ;;
-  esac
-fi
-
-if test x$threads = xcheck; then
-  AC_MSG_ERROR([thread support not available; use --disable-threads to force single-threaded mode])
-fi
-])dnl
diff --git a/makefile b/makefile
deleted file mode 100644
index e9e37a6..0000000
--- a/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# file      : makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make
-
-dirs := odb/mysql
-
-default  := $(out_base)/
-dist     := $(out_base)/.dist
-clean    := $(out_base)/.clean
-
-$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
-
-$(dist): export dirs := $(dirs)
-$(dist): export docs := GPLv2 LICENSE README NEWS version.txt
-$(dist): data_dist := INSTALL libodb-mysql-vc8.sln libodb-mysql-vc9.sln \
-libodb-mysql-vc10.sln libodb-mysql-vc11.sln libodb-mysql-vc12.sln
-$(dist): exec_dist := bootstrap
-$(dist): export extra_dist := $(data_dist) $(exec_dist)
-$(dist): export version = $(shell cat $(src_root)/version.txt)
-
-$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs)))
-	$(call dist-data,$(docs) $(data_dist) libodb-mysql.pc.in)
-	$(call dist-exec,$(exec_dist))
-	$(call dist-dir,m4)
-	$(call meta-automake)
-	$(call meta-autoconf)
-
-$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs)))
-
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/automake.make)
-$(call include,$(bld_root)/meta/autoconf.make)
-
-$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile))
diff --git a/odb/mysql/Makefile.am b/odb/mysql/Makefile.am
deleted file mode 100644
index 3ceb99c..0000000
--- a/odb/mysql/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# file      : odb/mysql/Makefile.am
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-lib_LTLIBRARIES = libodb-mysql.la
-libodb_mysql_la_SOURCES = __path__(sources)
-
-odbmysqlincludedir = $(includedir)/odb/mysql/
-nobase_odbmysqlinclude_HEADERS = __path__(headers)
-nobase_nodist_odbmysqlinclude_HEADERS = details/config.h
-
-EXTRA_DIST = __file__(extra_dist)
-
-AM_CPPFLAGS= -I'$(top_builddir)' -I'$(top_srcdir)' -DLIBODB_MYSQL_DYNAMIC_LIB
-AM_LDFLAGS = -release __value__(interface_version) -no-undefined
diff --git a/odb/mysql/libodb-mysql-vc10.vcxproj b/odb/mysql/libodb-mysql-vc10.vcxproj
deleted file mode 100644
index 8f58d9a..0000000
--- a/odb/mysql/libodb-mysql-vc10.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb-mysql</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc10</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc10.vcxproj.filters b/odb/mysql/libodb-mysql-vc10.vcxproj.filters
deleted file mode 100644
index 115907d..0000000
--- a/odb/mysql/libodb-mysql-vc10.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{0347216A-CA2E-4378-8C44-8539C22EE47C}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{EEA5E942-4493-4517-8D9B-660178508331}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc11.vcxproj b/odb/mysql/libodb-mysql-vc11.vcxproj
deleted file mode 100644
index 60ae77e..0000000
--- a/odb/mysql/libodb-mysql-vc11.vcxproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb-mysql</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc11</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc11.vcxproj.filters b/odb/mysql/libodb-mysql-vc11.vcxproj.filters
deleted file mode 100644
index 115907d..0000000
--- a/odb/mysql/libodb-mysql-vc11.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{0347216A-CA2E-4378-8C44-8539C22EE47C}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{EEA5E942-4493-4517-8D9B-660178508331}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc12.vcxproj b/odb/mysql/libodb-mysql-vc12.vcxproj
deleted file mode 100644
index b0af8f2..0000000
--- a/odb/mysql/libodb-mysql-vc12.vcxproj
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95CDD546-E71F-41BC-9D8D-ADF60CEAEF8C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libodb-mysql</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-d-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\bin64\</OutDir>
-    <TargetName>odb-mysql-__value__(interface_version)-vc12</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb-d.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql-d.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4355;4800;4290;4251;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>odb.lib;libmysql.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>$(TargetPath)</OutputFile>
-      <ImportLibrary>..\..\lib64\odb-mysql.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-__header_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_entries__(sources)
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc12.vcxproj.filters b/odb/mysql/libodb-mysql-vc12.vcxproj.filters
deleted file mode 100644
index 115907d..0000000
--- a/odb/mysql/libodb-mysql-vc12.vcxproj.filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{0347216A-CA2E-4378-8C44-8539C22EE47C}</UniqueIdentifier>
-      <Extensions>cxx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{EEA5E942-4493-4517-8D9B-660178508331}</UniqueIdentifier>
-      <Extensions>h;hxx;ixx;txx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-__header_filter_entries__(headers)
-  </ItemGroup>
-  <ItemGroup>
-__source_filter_entries__(sources)
-  </ItemGroup>
-</Project>
diff --git a/odb/mysql/libodb-mysql-vc8.vcproj b/odb/mysql/libodb-mysql-vc8.vcproj
deleted file mode 100644
index 3d112de..0000000
--- a/odb/mysql/libodb-mysql-vc8.vcproj
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libodb-mysql"
-	ProjectGUID="{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}"
-	RootNamespace="libodb-mysql"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib mkdir ..\..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb-d.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin\odb-mysql-d-__value__(interface_version)-vc8.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\odb-mysql-d.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb-d.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin64\odb-mysql-d-__value__(interface_version)-vc8.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\odb-mysql-d.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib mkdir ..\..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin\odb-mysql-__value__(interface_version)-vc8.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\odb-mysql.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin64\odb-mysql-__value__(interface_version)-vc8.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\odb-mysql.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cxx"
-			UniqueIdentifier="{07EA5579-4EE8-4B71-BD72-5FFDFF9D28FC}"
-			>
-__source_entries__(sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{11553374-F2B1-4ABC-BB27-07A0C831B938}"
-			>
-__file_entries__(headers)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/odb/mysql/libodb-mysql-vc9.vcproj b/odb/mysql/libodb-mysql-vc9.vcproj
deleted file mode 100644
index 98f0e37..0000000
--- a/odb/mysql/libodb-mysql-vc9.vcproj
+++ /dev/null
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libodb-mysql"
-	ProjectGUID="{A41BCC58-E44A-49E9-8DD5-12F9B5AFE12A}"
-	RootNamespace="libodb-mysql"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib mkdir ..\..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb-d.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin\odb-mysql-d-__value__(interface_version)-vc9.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib\odb-mysql-d.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb-d.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin64\odb-mysql-d-__value__(interface_version)-vc9.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\lib64\odb-mysql-d.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib mkdir ..\..\lib"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin\odb-mysql-__value__(interface_version)-vc9.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib\odb-mysql.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\.."
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4267"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_MYSQL_DYNAMIC_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="if not exist ..\..\lib64 mkdir ..\..\lib64"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odb.lib libmysql.lib"
-				OutputFile="$(OutDir)\bin64\odb-mysql-__value__(interface_version)-vc9.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\lib64\odb-mysql.lib"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cxx"
-			UniqueIdentifier="{07EA5579-4EE8-4B71-BD72-5FFDFF9D28FC}"
-			>
-__source_entries__(sources)
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hxx;ixx;txx"
-			UniqueIdentifier="{11553374-F2B1-4ABC-BB27-07A0C831B938}"
-			>
-__file_entries__(headers)
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/odb/mysql/makefile b/odb/mysql/makefile
deleted file mode 100644
index 2a8f6bf..0000000
--- a/odb/mysql/makefile
+++ /dev/null
@@ -1,160 +0,0 @@
-# file      : odb/mysql/makefile
-# license   : GNU GPL v2; see accompanying LICENSE file
-
-include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
-
-cxx :=                       \
-connection.cxx               \
-connection-factory.cxx       \
-database.cxx                 \
-enum.cxx                     \
-error.cxx                    \
-exceptions.cxx               \
-prepared-query.cxx           \
-query.cxx                    \
-query-dynamic.cxx            \
-query-const-expr.cxx         \
-simple-object-statements.cxx \
-statement.cxx                \
-statements-base.cxx          \
-tracer.cxx                   \
-traits.cxx                   \
-transaction.cxx              \
-transaction-impl.cxx
-
-cli_tun := details/options.cli
-cxx_tun := $(cxx)
-cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(cli_tun:.cli=.o))
-cxx_od  := $(cxx_obj:.o=.o.d)
-
-odb_mysql.l             := $(out_base)/odb-mysql.l
-odb_mysql.l.cpp-options := $(out_base)/odb-mysql.l.cpp-options
-
-default := $(out_base)/
-dist    := $(out_base)/.dist
-clean   := $(out_base)/.clean
-
-# Import.
-#
-$(call import,\
-  $(scf_root)/import/cli/stub.make,\
-  cli: cli,cli-rules: cli_rules)
-
-$(call import,\
-  $(scf_root)/import/libodb/stub.make,\
-  l: odb.l,cpp-options: odb.l.cpp-options)
-
-#$(call import,\
-#  $(scf_root)/import/libmysqlclient/stub.make,\
-#  l: mysql.l,cpp-options: mysql.l.cpp-options)
-
-$(call import,\
-  $(scf_root)/import/libmysqlclient_r/stub.make,\
-  l: mysql.l,cpp-options: mysql.l.cpp-options)
-
-# Build.
-#
-$(odb_mysql.l): $(cxx_obj) $(odb.l) $(mysql.l)
-$(odb_mysql.l.cpp-options): value := -I$(out_root) -I$(src_root)
-$(odb_mysql.l.cpp-options): $(odb.l.cpp-options) $(mysql.l.cpp-options)
-
-$(cxx_obj) $(cxx_od): $(odb_mysql.l.cpp-options) $(out_base)/details/config.h
-
-genf := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx) $(cli_tun:.cli=.cxx)
-gen  := $(addprefix $(out_base)/,$(genf))
-
-# Don't try to depend on the installed executable.
-#
-ifneq ($(cli),cli)
-$(gen): $(cli)
-endif
-
-$(gen): cli := $(cli)
-$(gen): cli_options +=                   \
---long-usage                             \
---generate-specifier                     \
---generate-file-scanner                  \
---cli-namespace odb::mysql::details::cli \
---guard-prefix LIBODB_MYSQL_DETAILS
-
-$(out_base)/details/config.h: | $(out_base)/details/.
-	@echo '/* file      : odb/mysql/details/config.h'                >$@
-	@echo ' * note      : automatically generated'                  >>$@
-	@echo ' */'                                                     >>$@
-	@echo ''                                                        >>$@
-	@echo '#ifndef ODB_MYSQL_DETAILS_CONFIG_H'                      >>$@
-	@echo '#define ODB_MYSQL_DETAILS_CONFIG_H'                      >>$@
-	@echo ''                                                        >>$@
-	@echo '#define LIBODB_MYSQL_INCLUDE_LONG 1'                     >>$@
-#	@echo '#define LIBODB_MYSQL_THR_KEY_VISIBLE 1'			>>$@
-	@echo ''                                                        >>$@
-	@echo '#endif /* ODB_MYSQL_DETAILS_CONFIG_H */'                 >>$@
-
-$(call include-dep,$(cxx_od),$(cxx_obj),$(gen) $(out_base)/details/config.h)
-
-# Convenience alias for default target.
-#
-$(out_base)/: $(odb_mysql.l)
-
-# Dist.
-#
-$(dist): sources_dist := $(cxx)
-$(dist): export sources := $(sources_dist) $(cli_tun:.cli=.cxx)
-$(dist): headers_dist = $(subst $(src_base)/,,$(shell find $(src_base) \
--name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))
-$(dist): gen_headers := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx)
-$(dist): export headers = $(sort $(headers_dist) $(gen_headers))
-$(dist): gen_dist := $(gen)
-$(dist): data_dist := $(cli_tun) details/config.h.in details/config-vc.h
-$(dist): export extra_dist := $(data_dist)                  \
-libodb-mysql-vc8.vcproj libodb-mysql-vc9.vcproj             \
-libodb-mysql-vc10.vcxproj libodb-mysql-vc10.vcxproj.filters \
-libodb-mysql-vc11.vcxproj libodb-mysql-vc11.vcxproj.filters \
-libodb-mysql-vc12.vcxproj libodb-mysql-vc12.vcxproj.filters
-$(dist): export interface_version = $(shell sed -e \
-'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version.txt)
-
-$(dist): $(gen)
-	$(call dist-data,$(sources_dist) $(headers_dist) $(data_dist))
-	$(call dist-data,$(gen_dist),$(dist_prefix)/odb/mysql/details)
-	$(call meta-vc8proj,$(src_base)/libodb-mysql-vc8.vcproj)
-	$(call meta-vc9proj,$(src_base)/libodb-mysql-vc9.vcproj)
-	$(call meta-vc10proj,$(src_base)/libodb-mysql-vc10.vcxproj)
-	$(call meta-vc11proj,$(src_base)/libodb-mysql-vc11.vcxproj)
-	$(call meta-vc12proj,$(src_base)/libodb-mysql-vc12.vcxproj)
-	$(call meta-automake)
-
-# Clean.
-#
-$(clean): $(odb_mysql.l).o.clean    \
-  $(odb_mysql.l.cpp-options).clean  \
-  $(addsuffix .cxx.clean,$(cxx_obj)) \
-  $(addsuffix .cxx.clean,$(cxx_od))  \
-  $(addprefix $(out_base)/,$(cli_tun:.cli=.cxx.cli.clean))
-	$(call message,rm $$1,rm -f $$1,$(out_base)/details/config.h)
-
-# Generated .gitignore.
-#
-ifeq ($(out_base),$(src_base))
-$(odb_mysql.l): | $(out_base)/.gitignore
-
-$(out_base)/.gitignore: files := details/config.h $(genf)
-$(clean): $(out_base)/.gitignore.clean
-
-$(call include,$(bld_root)/git/gitignore.make)
-endif
-
-# How to.
-#
-$(call include,$(bld_root)/dist.make)
-$(call include,$(bld_root)/meta/vc8proj.make)
-$(call include,$(bld_root)/meta/vc9proj.make)
-$(call include,$(bld_root)/meta/vc10proj.make)
-$(call include,$(bld_root)/meta/vc11proj.make)
-$(call include,$(bld_root)/meta/vc12proj.make)
-$(call include,$(bld_root)/meta/automake.make)
-
-$(call include,$(cli_rules))
-$(call include,$(bld_root)/cxx/o-l.make)
-$(call include,$(bld_root)/cxx/cxx-o.make)
-$(call include,$(bld_root)/cxx/cxx-d.make)
diff --git a/repositories.manifest b/repositories.manifest
deleted file mode 100644
index efd374c..0000000
--- a/repositories.manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-: 1
-summary: MySQL ODB runtime library repository
-
-:
-role: prerequisite
-location: https://git.build2.org/packaging/mysql/mysql.git##HEAD
-
-:
-role: prerequisite
-location: ../libodb.git##HEAD
-
-:
-role: prerequisite
-location: https://git.codesynthesis.com/cli/cli.git##HEAD
diff --git a/version.txt b/version.txt
deleted file mode 100644
index 6bc2f39..0000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.5.0-b.26