Support for automake and VC++ builds

41 files changed, 1654 insertions, 137 deletions

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..a50a177
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,12 @@
+# file      : Makefile.am
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# 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/README b/README
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/README
diff --git a/bootstrap b/bootstrap
new file mode 100755
index 0000000..ceb2ea7
--- /dev/null
+++ b/bootstrap
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+# file      : bootstrap
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# 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
index 9c7b03b..b3d350f 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -19,25 +19,33 @@ endif
 
 # Aliases
 #
-.PHONY: $(out_base)/         \
-        $(out_base)/.test    \
-        $(out_base)/.install \
+.PHONY: $(out_base)/       \
+        $(out_base)/.test  \
+        $(out_base)/.dist  \
         $(out_base)/.clean
 
 ifdef %interactive%
 
-.PHONY: test install clean
+.PHONY: test dist clean
 
-test:    $(out_base)/.test
-install: $(out_base)/.install
-clean:   $(out_base)/.clean
+test:  $(out_base)/.test
+dist:  $(out_base)/.dist
+clean: $(out_base)/.clean
 
-ifneq ($(filter $(.DEFAULT_GOAL),test install 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
+
 # Don't include dependency info for certain targets.
 #
 define include-dep
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..612cdfc
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,60 @@
+# file      : configure.ac
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# 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 subdir-objects dist-bzip2 dist-zip tar-ustar])
+
+LT_INIT([win32-dll])
+
+AC_CANONICAL_HOST
+
+# Check for C++ compiler and use it to compile the tests.
+#
+AC_PROG_CXX
+AC_LANG(C++)
+
+# Required by subdir-objects.
+#
+AM_PROG_CC_C_O
+
+# 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])])
+
+# Check for libodb.
+#
+LIBODB([],[AC_MSG_ERROR([libodb is not found; consider using --with-libodb=DIR])])
+
+# Allow the user to specify the pkgconfig directory.
+#
+PKGCONFIG
+
+# Check if we should disable rpath.
+#
+DISABLE_RPATH
+
+# Output.
+#
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([
+  __path__(config_files)
+])
+AC_OUTPUT
diff --git a/libodb-mysql-vc10.sln b/libodb-mysql-vc10.sln
new file mode 100644
index 0000000..1f9129b
--- /dev/null
+++ b/libodb-mysql-vc10.sln
@@ -0,0 +1,26 @@
+

+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-vc9.sln b/libodb-mysql-vc9.sln
new file mode 100644
index 0000000..1999291
--- /dev/null
+++ b/libodb-mysql-vc9.sln
@@ -0,0 +1,26 @@
+

+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
new file mode 100644
index 0000000..91045a8
--- /dev/null
+++ b/libodb-mysql.pc.in
@@ -0,0 +1,16 @@
+# file      : libodb-mysql.pc.in
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libodb-mysql
+Description: Object persistence compiler for C++, MySQL runtime
+URL: http://www.codesynthesis.com/products/odb/
+Version: @VERSION@
+Libs: -L${libdir} -lodb-mysql
+Cflags: -I${includedir}
diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
new file mode 100644
index 0000000..feeb01d
--- /dev/null
+++ b/m4/acx_pthread.m4
@@ -0,0 +1,254 @@
+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:
+
+        acx_pthread_flags="-pthreads pthread -mt -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";;
+            *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
new file mode 100644
index 0000000..da77bbe
--- /dev/null
+++ b/m4/disable-rpath.m4
@@ -0,0 +1,26 @@
+dnl file      : m4/disable-rpath.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+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
new file mode 100644
index 0000000..3f607a2
--- /dev/null
+++ b/m4/libmysqlclient.m4
@@ -0,0 +1,53 @@
+dnl file      : m4/libmysqlclient.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+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"
+
+CXX_LIBTOOL_LINK_IFELSE(
+AC_LANG_SOURCE([[
+#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])
+
+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
+])dnl
diff --git a/m4/libodb.m4 b/m4/libodb.m4
new file mode 100644
index 0000000..a205afd
--- /dev/null
+++ b/m4/libodb.m4
@@ -0,0 +1,83 @@
+dnl file      : m4/libodb.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+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
new file mode 100644
index 0000000..229b270
--- /dev/null
+++ b/m4/libtool-link.m4
@@ -0,0 +1,31 @@
+dnl file      : m4/libtool-link.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+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
+save_CXX="$CXX"
+CXX="./libtool --tag=CXX --mode=link $CXX -no-install"
+AC_LANG(C++)
+
+if test -d .libs; then
+  delete_libs_dir=no
+else
+  delete_libs_dir=yes
+fi
+
+AC_LINK_IFELSE([$1], [$2], [$3])
+
+if test x"$delete_libs_dir" != xyes; then
+  rm -rf .libs
+fi
+
+CXX="$save_CXX"
+AC_LANG_RESTORE])dnl
diff --git a/m4/pkgconfig.m4 b/m4/pkgconfig.m4
new file mode 100644
index 0000000..ef48ee8
--- /dev/null
+++ b/m4/pkgconfig.m4
@@ -0,0 +1,13 @@
+dnl file      : m4/pkgconfig.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+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/threads.m4 b/m4/threads.m4
new file mode 100644
index 0000000..7c32abe
--- /dev/null
+++ b/m4/threads.m4
@@ -0,0 +1,41 @@
+dnl file      : m4/threads.m4
+dnl author    : Boris Kolpackov <boris@codesynthesis.com>
+dnl copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+dnl license   : GNU GPL v2; see accompanying LICENSE file
+dnl
+AC_DEFUN([THREADS],[
+
+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
+      threads=win32
+      ;;
+    *)
+      ACX_PTHREAD
+
+      if test x$acx_pthread_ok = xyes; then
+        threads=posix
+        LIBS="$LIBS $PTHREAD_LIBS"
+        CXXFLAGS="$CXXFLAGS $PTHREAD_CXXFLAGS"
+      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
index ea14d69..e760441 100644
--- a/makefile
+++ b/makefile
@@ -5,30 +5,32 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make
 
+dirs := odb/mysql
+
 default  := $(out_base)/
-test     := $(out_base)/.test
-install  := $(out_base)/.install
+dist     := $(out_base)/.dist
 clean    := $(out_base)/.clean
 
-# Build.
-#
-$(default): $(out_base)/odb/mysql/ #$(out_base)/tests/
+$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
 
-# Test.
-#
-$(test): $(out_base)/tests/.test
+$(dist): export dirs := $(dirs)
+$(dist): export docs := GPLv2 LICENSE README version
+$(dist): data_dist := libodb-mysql-vc9.sln libodb-mysql-vc10.sln
+$(dist): exec_dist := bootstrap
+$(dist): export extra_dist := $(data_dist) $(exec_dist)
+$(dist): export version = $(shell cat $(src_root)/version)
 
-# Install.
-#
-$(install): $(out_base)/odb/mysql/.install
-	$(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/libodb-mysql/LICENSE)
-	$(call install-data,$(src_base)/README,$(install_doc_dir)/libodb-mysql/README)
+$(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.
-#
-$(clean): $(out_base)/odb/mysql/.clean #$(out_base)/tests/.clean
+$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs)))
 
-$(call include,$(bld_root)/install.make)
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/automake.make)
+$(call include,$(bld_root)/meta/autoconf.make)
 
-$(call import,$(src_base)/odb/mysql/makefile)
-#$(call import,$(src_base)/tests/makefile)
+$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile))
diff --git a/odb/mysql/Makefile.am b/odb/mysql/Makefile.am
new file mode 100644
index 0000000..3d5c2b3
--- /dev/null
+++ b/odb/mysql/Makefile.am
@@ -0,0 +1,15 @@
+# file      : odb/mysql/Makefile.am
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# 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)
+
+EXTRA_DIST = __file__(extra_dist)
+
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
+libodb_mysql_la_LDFLAGS = -release __value__(interface_version)
diff --git a/odb/mysql/connection-factory.cxx b/odb/mysql/connection-factory.cxx
index db7a702..c490048 100644
--- a/odb/mysql/connection-factory.cxx
+++ b/odb/mysql/connection-factory.cxx
@@ -3,14 +3,25 @@
 // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h> // CR_UNKNOWN_ERROR
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#  include <errmsg.h>       // CR_UNKNOWN_ERROR
+#else
+#  include <mysql/mysql.h>
+#  include <mysql/errmsg.h>
+#endif
 
 #include <odb/mysql/connection-factory.hxx>
 #include <odb/mysql/exceptions.hxx>
 
 #include <odb/details/tls.hxx>
 #include <odb/details/lock.hxx>
+#include <odb/details/config.hxx> // ODB_THREADS_NONE
 
 using namespace std;
 
@@ -24,6 +35,7 @@ namespace odb
     {
       struct mysql_init
       {
+#ifndef ODB_THREADS_NONE
         mysql_init ()
         {
           if (my_thread_init ())
@@ -37,6 +49,7 @@ namespace odb
         {
           my_thread_end ();
         }
+#endif
       };
 
       static ODB_TLS_OBJECT (mysql_init) mysql_init_;
diff --git a/odb/mysql/connection-factory.hxx b/odb/mysql/connection-factory.hxx
index 4d57d75..2cd4184 100644
--- a/odb/mysql/connection-factory.hxx
+++ b/odb/mysql/connection-factory.hxx
@@ -6,6 +6,8 @@
 #ifndef ODB_MYSQL_CONNECTION_FACTORY_HXX
 #define ODB_MYSQL_CONNECTION_FACTORY_HXX
 
+#include <odb/pre.hxx>
+
 #include <vector>
 #include <cstddef> // std::size_t
 
@@ -17,11 +19,13 @@
 #include <odb/details/condition.hxx>
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
-    class connection_factory
+    class LIBODB_MYSQL_EXPORT connection_factory
     {
     public:
       virtual details::shared_ptr<connection>
@@ -37,7 +41,7 @@ namespace odb
       ~connection_factory ();
     };
 
-    class new_connection_factory: public connection_factory
+    class LIBODB_MYSQL_EXPORT new_connection_factory: public connection_factory
     {
     public:
       new_connection_factory ()
@@ -59,7 +63,8 @@ namespace odb
       database_type* db_;
     };
 
-    class connection_pool_factory: public connection_factory
+    class LIBODB_MYSQL_EXPORT connection_pool_factory:
+      public connection_factory
     {
     public:
       // The max_connections argument specifies the maximum number of
@@ -142,4 +147,6 @@ namespace odb
   }
 }
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_CONNECTION_FACTORY_HXX
diff --git a/odb/mysql/connection.hxx b/odb/mysql/connection.hxx
index cc5e5f0..9cbd5c5 100644
--- a/odb/mysql/connection.hxx
+++ b/odb/mysql/connection.hxx
@@ -6,7 +6,18 @@
 #ifndef ODB_MYSQL_CONNECTION_HXX
 #define ODB_MYSQL_CONNECTION_HXX
 
-#include <mysql/mysql.h>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <vector>
 
@@ -17,11 +28,13 @@
 
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
-    class connection: public details::shared_base
+    class LIBODB_MYSQL_EXPORT connection: public details::shared_base
     {
     public:
       typedef mysql::statement_cache statement_cache_type;
@@ -87,4 +100,6 @@ namespace odb
   }
 }
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_CONNECTION_HXX
diff --git a/odb/mysql/database.hxx b/odb/mysql/database.hxx
index 3272eda..0344f3c 100644
--- a/odb/mysql/database.hxx
+++ b/odb/mysql/database.hxx
@@ -6,7 +6,18 @@
 #ifndef ODB_MYSQL_DATABASE_HXX
 #define ODB_MYSQL_DATABASE_HXX
 
-#include <mysql/mysql.h>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <string>
 #include <memory> // std::auto_ptr
@@ -21,11 +32,13 @@
 
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
-    class database: public odb::database
+    class LIBODB_MYSQL_EXPORT database: public odb::database
     {
     public:
       typedef mysql::connection connection_type;
@@ -156,4 +169,6 @@ namespace odb
 
 #include <odb/mysql/database.ixx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_DATABASE_HXX
diff --git a/odb/mysql/details/config.hxx b/odb/mysql/details/config.hxx
new file mode 100644
index 0000000..f8418c6
--- /dev/null
+++ b/odb/mysql/details/config.hxx
@@ -0,0 +1,19 @@
+// file      : odb/mysql/details/config.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_MYSQL_DETAILS_CONFIG_HXX
+#define ODB_MYSQL_DETAILS_CONFIG_HXX
+
+// no pre
+
+#ifndef LIBODB_MYSQL_INCLUDE_SHORT
+  #ifdef _WIN32
+    #define LIBODB_MYSQL_INCLUDE_SHORT 1
+  #endif
+#endif
+
+// no post
+
+#endif // ODB_MYSQL_DETAILS_CONFIG_HXX
diff --git a/odb/mysql/details/export.hxx b/odb/mysql/details/export.hxx
new file mode 100644
index 0000000..bb3bac5
--- /dev/null
+++ b/odb/mysql/details/export.hxx
@@ -0,0 +1,27 @@
+// file      : odb/mysql/details/export.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_MYSQL_DETAILS_EXPORT_HXX
+#define ODB_MYSQL_DETAILS_EXPORT_HXX
+
+#include <odb/pre.hxx>
+
+#ifdef LIBODB_MYSQL_STATIC_LIB
+#  define LIBODB_MYSQL_EXPORT
+#else
+#  ifdef _WIN32
+#    ifdef LIBODB_MYSQL_DYNAMIC_LIB
+#      define LIBODB_MYSQL_EXPORT __declspec(dllexport)
+#    else
+#      define LIBODB_MYSQL_EXPORT __declspec(dllimport)
+#    endif
+#  else
+#    define LIBODB_MYSQL_EXPORT
+#  endif
+#endif
+
+#include <odb/post.hxx>
+
+#endif // ODB_MYSQL_DETAILS_EXPORT_HXX
diff --git a/odb/mysql/exceptions.cxx b/odb/mysql/exceptions.cxx
index 1373874..b857fb6 100644
--- a/odb/mysql/exceptions.cxx
+++ b/odb/mysql/exceptions.cxx
@@ -3,7 +3,16 @@
 // copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#include <mysql/errmsg.h> // CR_OUT_OF_MEMORY
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <errmsg.h>       // CR_OUT_OF_MEMORY
+#else
+#  include <mysql/errmsg.h>
+#endif
 
 #include <new>     // std::bad_alloc
 #include <sstream>
diff --git a/odb/mysql/exceptions.hxx b/odb/mysql/exceptions.hxx
index 86cbb19..6be2d80 100644
--- a/odb/mysql/exceptions.hxx
+++ b/odb/mysql/exceptions.hxx
@@ -6,19 +6,32 @@
 #ifndef ODB_MYSQL_EXCEPTIONS_HXX
 #define ODB_MYSQL_EXCEPTIONS_HXX
 
-#include <string>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
-#include <mysql/mysql.h>
+#include <string>
 
 #include <odb/exceptions.hxx>
 
 #include <odb/mysql/version.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
-    struct database_exception: odb::database_exception
+    struct LIBODB_MYSQL_EXPORT database_exception: odb::database_exception
     {
       database_exception (MYSQL*);
       database_exception (MYSQL_STMT*);
@@ -62,4 +75,6 @@ namespace odb
   }
 }
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_EXCEPTIONS_HXX
diff --git a/odb/mysql/forward.hxx b/odb/mysql/forward.hxx
index 54bf7bf..095b857 100644
--- a/odb/mysql/forward.hxx
+++ b/odb/mysql/forward.hxx
@@ -6,6 +6,8 @@
 #ifndef ODB_MYSQL_FORWARD_HXX
 #define ODB_MYSQL_FORWARD_HXX
 
+#include <odb/pre.hxx>
+
 namespace odb
 {
   namespace mysql
@@ -22,4 +24,6 @@ namespace odb
   }
 }
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_FORWARD_HXX
diff --git a/odb/mysql/libodb-mysql-vc10.vcxproj b/odb/mysql/libodb-mysql-vc10.vcxproj
new file mode 100644
index 0000000..bd7eb88
--- /dev/null
+++ b/odb/mysql/libodb-mysql-vc10.vcxproj
@@ -0,0 +1,174 @@
+<?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;%(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;%(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;%(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;%(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
new file mode 100644
index 0000000..115907d
--- /dev/null
+++ b/odb/mysql/libodb-mysql-vc10.vcxproj.filters
@@ -0,0 +1,19 @@
+<?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-vc9.vcproj b/odb/mysql/libodb-mysql-vc9.vcproj
new file mode 100644
index 0000000..3d578fc
--- /dev/null
+++ b/odb/mysql/libodb-mysql-vc9.vcproj
@@ -0,0 +1,359 @@
+<?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"
+				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"
+				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"
+				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"
+				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
index 4f1735f..49d42a7 100644
--- a/odb/mysql/makefile
+++ b/odb/mysql/makefile
@@ -5,7 +5,7 @@
 
 include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
 
-cxx_tun   :=           \
+cxx :=                 \
 connection.cxx         \
 connection-factory.cxx \
 database.cxx           \
@@ -13,17 +13,19 @@ exceptions.cxx         \
 transaction.cxx        \
 transaction-impl.cxx   \
 statement.cxx          \
-query.cxx
+query.cxx              \
+traits.cxx
 
-cxx_obj   := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
-cxx_od    := $(cxx_obj:.o=.o.d)
+cxx_tun := $(cxx)
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.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)/
-install   := $(out_base)/.install
-clean     := $(out_base)/.clean
+default := $(out_base)/
+dist    := $(out_base)/.dist
+clean   := $(out_base)/.clean
 
 # Import.
 #
@@ -53,12 +55,21 @@ $(call include-dep,$(cxx_od))
 #
 $(out_base)/: $(odb_mysql.l)
 
-# Install.
+# Dist.
 #
-$(install): $(odb_mysql.l)
-	$(call install-lib,$<,$(install_lib_dir)/$(ld_lib_prefix)odb-mysql$(ld_lib_suffix))
-	$(call install-dir,$(src_base),$(install_inc_dir)/odb/mysql,\
-'(' -name '*.hxx' -o -name '*.ixx' -o -name '*.txx' ')')
+$(dist): export sources := $(cxx)
+$(dist): export headers = $(subst $(src_base)/,,$(shell find $(src_base) \
+-name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))
+$(dist): export extra_dist := libodb-mysql-vc9.vcproj \
+libodb-mysql-vc10.vcxproj libodb-mysql-vc10.vcxproj.filters
+$(dist): export interface_version = $(shell sed -e \
+'s/^\([0-9]*\.[0-9]*\).*/\1/' $(src_root)/version)
+
+$(dist):
+	$(call dist-data,$(sources) $(headers))
+	$(call meta-vc9proj,$(src_base)/libodb-mysql-vc9.vcproj)
+	$(call meta-vc10proj,$(src_base)/libodb-mysql-vc10.vcxproj)
+	$(call meta-automake)
 
 # Clean.
 #
@@ -69,6 +80,11 @@ $(clean): $(odb_mysql.l).o.clean    \
 
 # How to.
 #
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
 $(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/odb/mysql/query.cxx b/odb/mysql/query.cxx
index 3d7fb68..b159c2a 100644
--- a/odb/mysql/query.cxx
+++ b/odb/mysql/query.cxx
@@ -58,6 +58,8 @@ namespace odb
 
       binding_.insert (
         binding_.end (), q.binding_.begin (), q.binding_.end ());
+
+      return *this;
     }
 
     void query::
diff --git a/odb/mysql/query.hxx b/odb/mysql/query.hxx
index b09442c..5dd4339 100644
--- a/odb/mysql/query.hxx
+++ b/odb/mysql/query.hxx
@@ -6,7 +6,18 @@
 #ifndef ODB_MYSQL_QUERY_HXX
 #define ODB_MYSQL_QUERY_HXX
 
-#include <mysql/mysql.h>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <string>
 #include <vector>
@@ -21,6 +32,8 @@
 #include <odb/details/buffer.hxx>
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
@@ -45,7 +58,7 @@ namespace odb
       const T& ref;
     };
 
-    struct query_param: details::shared_base
+    struct LIBODB_MYSQL_EXPORT query_param: details::shared_base
     {
       virtual
       ~query_param ();
@@ -77,7 +90,7 @@ namespace odb
     template <typename T, image_id_type ID>
     struct query_column;
 
-    class query
+    class LIBODB_MYSQL_EXPORT query
     {
     public:
       query ()
@@ -187,7 +200,7 @@ namespace odb
       std::vector<MYSQL_BIND> binding_;
     };
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator+ (const query& x, const query& y)
     {
       query r (x);
@@ -233,7 +246,7 @@ namespace odb
       return r;
     }
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator+ (const query& q, const std::string& s)
     {
       query r (q);
@@ -241,7 +254,7 @@ namespace odb
       return r;
     }
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator+ (const std::string& s, const query& q)
     {
       query r (s);
@@ -287,7 +300,7 @@ namespace odb
       return r;
     }
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator&& (const query& x, const query& y)
     {
       query r ("(");
@@ -298,7 +311,7 @@ namespace odb
       return r;
     }
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator|| (const query& x, const query& y)
     {
       query r ("(");
@@ -309,7 +322,7 @@ namespace odb
       return r;
     }
 
-    inline query
+    inline LIBODB_MYSQL_EXPORT query
     operator! (const query& x)
     {
       query r ("!(");
@@ -1622,4 +1635,6 @@ namespace odb
 #include <odb/mysql/query.ixx>
 #include <odb/mysql/query.txx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_QUERY_HXX
diff --git a/odb/mysql/result.hxx b/odb/mysql/result.hxx
index f800f15..812cb68 100644
--- a/odb/mysql/result.hxx
+++ b/odb/mysql/result.hxx
@@ -6,6 +6,8 @@
 #ifndef ODB_MYSQL_RESULT_HXX
 #define ODB_MYSQL_RESULT_HXX
 
+#include <odb/pre.hxx>
+
 #include <odb/result.hxx>
 
 #include <odb/mysql/version.hxx>
@@ -52,4 +54,6 @@ namespace odb
 
 #include <odb/mysql/result.txx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_RESULT_HXX
diff --git a/odb/mysql/statement.cxx b/odb/mysql/statement.cxx
index 14907a9..9cacc4f 100644
--- a/odb/mysql/statement.cxx
+++ b/odb/mysql/statement.cxx
@@ -3,7 +3,16 @@
 // copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#include <mysql/mysqld_error.h> // ER_DUP_ENTRY, ER_LOCK_DEADLOCK
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysqld_error.h>       // ER_DUP_ENTRY, ER_LOCK_DEADLOCK
+#else
+#  include <mysql/mysqld_error.h>
+#endif
 
 #include <odb/mysql/statement.hxx>
 #include <odb/mysql/connection.hxx>
@@ -117,10 +126,6 @@ namespace odb
         {
           return success;
         }
-      case 1:
-        {
-          throw database_exception (stmt_);
-        }
       case MYSQL_NO_DATA:
         {
           return no_data;
@@ -129,6 +134,10 @@ namespace odb
         {
           return truncated;
         }
+      default:
+        {
+          throw database_exception (stmt_);
+        }
       }
     }
 
@@ -296,10 +305,6 @@ namespace odb
         {
           return success;
         }
-      case 1:
-        {
-          throw database_exception (stmt_);
-        }
       case MYSQL_NO_DATA:
         {
           free_result ();
@@ -309,6 +314,10 @@ namespace odb
         {
           return truncated;
         }
+      default:
+        {
+          throw database_exception (stmt_);
+        }
       }
     }
 
diff --git a/odb/mysql/statement.hxx b/odb/mysql/statement.hxx
index 427df3a..7ac9c61 100644
--- a/odb/mysql/statement.hxx
+++ b/odb/mysql/statement.hxx
@@ -6,7 +6,18 @@
 #ifndef ODB_MYSQL_STATEMENT_HXX
 #define ODB_MYSQL_STATEMENT_HXX
 
-#include <mysql/mysql.h>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <map>
 #include <string>
@@ -20,13 +31,15 @@
 
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
     class connection;
 
-    class binding
+    class LIBODB_MYSQL_EXPORT binding
     {
     public:
       binding (MYSQL_BIND* b, std::size_t n)
@@ -43,7 +56,7 @@ namespace odb
       binding& operator= (const binding&);
     };
 
-    class statement: public details::shared_base
+    class LIBODB_MYSQL_EXPORT statement: public details::shared_base
     {
     public:
       virtual
@@ -63,7 +76,7 @@ namespace odb
       MYSQL_STMT* stmt_;
     };
 
-    class query_statement: public statement
+    class LIBODB_MYSQL_EXPORT query_statement: public statement
     {
     public:
       virtual
@@ -106,7 +119,7 @@ namespace odb
       MYSQL_BIND* parameters_;
     };
 
-    class persist_statement: public statement
+    class LIBODB_MYSQL_EXPORT persist_statement: public statement
     {
     public:
       virtual
@@ -134,7 +147,7 @@ namespace odb
       std::size_t version_;
     };
 
-    class find_statement: public statement
+    class LIBODB_MYSQL_EXPORT find_statement: public statement
     {
     public:
       virtual
@@ -178,7 +191,7 @@ namespace odb
       std::size_t image_version_;
     };
 
-    class store_statement: public statement
+    class LIBODB_MYSQL_EXPORT store_statement: public statement
     {
     public:
       virtual
@@ -203,7 +216,7 @@ namespace odb
       std::size_t image_version_;
     };
 
-    class erase_statement: public statement
+    class LIBODB_MYSQL_EXPORT erase_statement: public statement
     {
     public:
       virtual
@@ -228,7 +241,8 @@ namespace odb
     // Statement cache.
     //
 
-    class object_statements_base: public details::shared_base
+    class LIBODB_MYSQL_EXPORT object_statements_base:
+      public details::shared_base
     {
     public:
       virtual
@@ -364,7 +378,7 @@ namespace odb
       details::shared_ptr<erase_statement_type> erase_;
     };
 
-    struct type_info_comparator
+    struct LIBODB_MYSQL_EXPORT type_info_comparator
     {
       bool
       operator() (const std::type_info* x, const std::type_info* y) const
@@ -381,7 +395,7 @@ namespace odb
       }
     };
 
-    class statement_cache
+    class LIBODB_MYSQL_EXPORT statement_cache
     {
     public:
       statement_cache (connection& conn)
@@ -418,4 +432,6 @@ namespace odb
 
 #include <odb/mysql/statement.txx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_STATEMENT_HXX
diff --git a/odb/mysql/traits.cxx b/odb/mysql/traits.cxx
new file mode 100644
index 0000000..f90cc0b
--- /dev/null
+++ b/odb/mysql/traits.cxx
@@ -0,0 +1,90 @@
+// file      : odb/mysql/traits.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#include <cstring> // std::memcpy, std::strlen
+
+#include <odb/mysql/traits.hxx>
+
+using namespace std;
+
+namespace odb
+{
+  namespace mysql
+  {
+    //
+    // value_traits<string>
+    //
+
+    void value_traits<string>::
+    set_image (char* s,
+               size_t c,
+               size_t& n,
+               bool& is_null,
+               const string& v)
+    {
+      is_null = false;
+      n = v.size ();
+
+      if (n > c)
+        n = c;
+
+      if (n != 0)
+        memcpy (s, v.c_str (), n);
+    }
+
+    void value_traits<string>::
+    set_image (details::buffer& b,
+               size_t& n,
+               bool& is_null,
+               const string& v)
+    {
+      is_null = false;
+      n = v.size ();
+
+      if (n > b.capacity ())
+        b.capacity (n);
+
+      if (n != 0)
+        memcpy (b.data (), v.c_str (), n);
+    }
+
+    //
+    // value_traits<const char*>
+    //
+
+    void value_traits<const char*>::
+    set_image (char* s,
+               size_t c,
+               size_t& n,
+               bool& is_null,
+               const char* v)
+    {
+      is_null = false;
+      n = strlen (v);
+
+      if (n > c)
+        n = c;
+
+      if (n != 0)
+        memcpy (s, v, n);
+    }
+
+    void value_traits<const char*>::
+    set_image (details::buffer& b,
+               size_t& n,
+               bool& is_null,
+               const char* v)
+    {
+      is_null = false;
+      n = strlen (v);
+
+      if (n > b.capacity ())
+        b.capacity (n);
+
+      if (n != 0)
+        memcpy (b.data (), v, n);
+    }
+  }
+}
diff --git a/odb/mysql/traits.hxx b/odb/mysql/traits.hxx
index b415bd1..bf52d78 100644
--- a/odb/mysql/traits.hxx
+++ b/odb/mysql/traits.hxx
@@ -6,11 +6,21 @@
 #ifndef ODB_MYSQL_TRAITS_HXX
 #define ODB_MYSQL_TRAITS_HXX
 
-#include <mysql/mysql.h> // MYSQL_TIME, used in custom specializations.
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>       // MYSQL_TIME, used in custom specializations.
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <string>
 #include <cstddef> // std::size_t
-#include <cstring> // std::memcpy, std::strlen
 
 #include <odb/traits.hxx>
 
@@ -18,6 +28,8 @@
 
 #include <odb/details/buffer.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
@@ -175,7 +187,7 @@ namespace odb
     // String type.
     //
     template <>
-    class value_traits<std::string>
+    class LIBODB_MYSQL_EXPORT value_traits<std::string>
     {
     public:
       typedef std::string type;
@@ -192,37 +204,17 @@ namespace odb
       }
 
       static void
-      set_image (char* s,
+      set_image (char*,
                  std::size_t c,
                  std::size_t& n,
                  bool& is_null,
-                 const std::string& v)
-      {
-        is_null = false;
-        n = v.size ();
-
-        if (n > c)
-          n = c;
-
-        if (n != 0)
-          std::memcpy (s, v.c_str (), n);
-      }
+                 const std::string&);
 
       static void
-      set_image (details::buffer& b,
+      set_image (details::buffer&,
                  std::size_t& n,
                  bool& is_null,
-                 const std::string& v)
-      {
-        is_null = false;
-        n = v.size ();
-
-        if (n > b.capacity ())
-          b.capacity (n);
-
-        if (n != 0)
-          std::memcpy (b.data (), v.c_str (), n);
-      }
+                 const std::string&);
     };
 
     // Specialization for const char* which only supports initialization
@@ -230,7 +222,7 @@ namespace odb
     // we can pass such values to the queries.
     //
     template <>
-    class value_traits<const char*>
+    class LIBODB_MYSQL_EXPORT value_traits<const char*>
     {
     public:
       typedef const char* type;
@@ -238,39 +230,21 @@ namespace odb
       static const image_id_type image_id = id_string;
 
       static void
-      set_image (char* s,
+      set_image (char*,
                  std::size_t c,
                  std::size_t& n,
                  bool& is_null,
-                 const char* v)
-      {
-        is_null = false;
-        n = std::strlen (v);
-
-        if (n > c)
-          n = c;
-
-        if (n != 0)
-          std::memcpy (s, v, n);
-      }
+                 const char*);
 
       static void
-      set_image (details::buffer& b,
+      set_image (details::buffer&,
                  std::size_t& n,
                  bool& is_null,
-                 const char* v)
-      {
-        is_null = false;
-        n = std::strlen (v);
-
-        if (n > b.capacity ())
-          b.capacity (n);
-
-        if (n != 0)
-          std::memcpy (b.data (), v, n);
-      }
+                 const char*);
     };
   }
 }
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_TRAITS_HXX
diff --git a/odb/mysql/transaction-impl.cxx b/odb/mysql/transaction-impl.cxx
index 42bc2aa..946ea23 100644
--- a/odb/mysql/transaction-impl.cxx
+++ b/odb/mysql/transaction-impl.cxx
@@ -3,7 +3,16 @@
 // copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#include <mysql/mysql.h>
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  ifdef _WIN32
+#    include <winsock2.h>
+#  endif
+#  include <mysql.h>
+#else
+#  include <mysql/mysql.h>
+#endif
 
 #include <odb/mysql/database.hxx>
 #include <odb/mysql/connection.hxx>
diff --git a/odb/mysql/transaction-impl.hxx b/odb/mysql/transaction-impl.hxx
index b9df516..8d589a8 100644
--- a/odb/mysql/transaction-impl.hxx
+++ b/odb/mysql/transaction-impl.hxx
@@ -6,6 +6,8 @@
 #ifndef ODB_MYSQL_TRANSACTION_IMPL_HXX
 #define ODB_MYSQL_TRANSACTION_IMPL_HXX
 
+#include <odb/pre.hxx>
+
 #include <odb/transaction.hxx>
 
 #include <odb/mysql/version.hxx>
@@ -13,11 +15,13 @@
 
 #include <odb/details/shared-ptr.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
-    class transaction_impl: public odb::transaction_impl
+    class LIBODB_MYSQL_EXPORT transaction_impl: public odb::transaction_impl
     {
     protected:
       friend class database;
@@ -48,4 +52,6 @@ namespace odb
 
 #include <odb/mysql/transaction-impl.ixx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_TRANSACTION_IMPL_HXX
diff --git a/odb/mysql/transaction.hxx b/odb/mysql/transaction.hxx
index 3d36d1d..ce3ed5b 100644
--- a/odb/mysql/transaction.hxx
+++ b/odb/mysql/transaction.hxx
@@ -6,18 +6,22 @@
 #ifndef ODB_MYSQL_TRANSACTION_HXX
 #define ODB_MYSQL_TRANSACTION_HXX
 
+#include <odb/pre.hxx>
+
 #include <odb/transaction.hxx>
 
 #include <odb/mysql/version.hxx>
 #include <odb/mysql/forward.hxx>
 
+#include <odb/mysql/details/export.hxx>
+
 namespace odb
 {
   namespace mysql
   {
     class transaction_impl;
 
-    class transaction: public odb::transaction
+    class LIBODB_MYSQL_EXPORT transaction: public odb::transaction
     {
     public:
       typedef mysql::database database_type;
@@ -51,4 +55,6 @@ namespace odb
 
 #include <odb/mysql/transaction.ixx>
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_TRANSACTION_HXX
diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx
index 1abbb6c..3ea6fcd 100644
--- a/odb/mysql/version.hxx
+++ b/odb/mysql/version.hxx
@@ -6,7 +6,15 @@
 #ifndef ODB_MYSQL_VERSION_HXX
 #define ODB_MYSQL_VERSION_HXX
 
-#include <mysql/mysql_version.h>
+#include <odb/pre.hxx>
+
+#include <odb/mysql/details/config.hxx>
+
+#ifdef LIBODB_MYSQL_INCLUDE_SHORT
+#  include <mysql_version.h>
+#else
+#  include <mysql/mysql_version.h>
+#endif
 
 #include <odb/version.hxx>
 
@@ -45,4 +53,6 @@
 #define LIBODB_MYSQL_VERSION     999901
 #define LIBODB_MYSQL_VERSION_STR "1.0.0.a1"
 
+#include <odb/post.hxx>
+
 #endif // ODB_MYSQL_VERSION_HXX