Switch to build2

24 files changed, 0 insertions, 2579 deletions

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/c++11.m4 b/m4/c++11.m4
deleted file mode 100644
index 42d38ad..0000000
--- a/m4/c++11.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-dnl file      : m4/cxx11.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl CXX11(MACRO, DESCRIPTION)
-dnl
-dnl Check if we are compiling in the C++11 mode. If we are, define MACRO as
-dnl both a macro and conditional as well as set the cxx11 variable to 'yes'.
-dnl
-AC_DEFUN([CXX11],
-[
-cxx11=no
-
-AC_MSG_CHECKING([whether we are in C++11 mode])
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <memory>
-
-int
-main ()
-{
-  std::shared_ptr<int> p (new int (10));
-  *p = 11;
-}
-])],
-[cxx11=yes])
-
-if test x"$cxx11" = xyes; then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([$1], [1], [$2])
-else
-  AC_MSG_RESULT([no])
-fi
-
-AM_CONDITIONAL([$1], [test x$cxx11 = xyes])
-
-])dnl
diff --git a/m4/database.m4 b/m4/database.m4
deleted file mode 100644
index e74a826..0000000
--- a/m4/database.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-dnl file      : m4/database.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl DATABASE
-dnl
-AC_DEFUN([DATABASE], [
-database=none
-
-AC_MSG_CHECKING([for database to use])
-
-AC_ARG_WITH(
-  [database],
-  [AC_HELP_STRING([--with-database=DB],
-                  [database to use for tests; valid values are: 'mysql', 'sqlite', 'pgsql', and 'oracle'])],
-  [case $withval in
-     no | yes)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([no database specified in the --with-database option])
-       ;;
-     mysql)
-       database=mysql
-       AC_DEFINE([DATABASE_MYSQL], [1], [Using MySQL.])
-       ;;
-     sqlite)
-       database=sqlite
-       AC_DEFINE([DATABASE_SQLITE], [1], [Using SQLite.])
-       ;;
-     pgsql)
-       database=pgsql
-       AC_DEFINE([DATABASE_PGSQL], [1], [Using PostgreSQL.])
-       ;;
-     oracle)
-       database=oracle
-       AC_DEFINE([DATABASE_ORACLE], [1], [Using Oracle.])
-       ;;
-     mssql)
-       database=mssql
-       AC_DEFINE([DATABASE_MSSQL], [1], [Using SQL Server.])
-       ;;
-     *)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([unknown database $withval])
-       ;;
-   esac],
-  [
-   AC_MSG_RESULT([])
-   AC_MSG_ERROR([no database specified with the --with-database option])
-  ])
-
-AC_MSG_RESULT([$database])
-AC_SUBST([database])
-
-AM_CONDITIONAL([DATABASE_MYSQL], [test x$database = xmysql])
-AM_CONDITIONAL([DATABASE_SQLITE], [test x$database = xsqlite])
-AM_CONDITIONAL([DATABASE_PGSQL], [test x$database = xpgsql])
-AM_CONDITIONAL([DATABASE_ORACLE], [test x$database = xoracle])
-AM_CONDITIONAL([DATABASE_MSSQL], [test x$database = xmssql])
-
-])dnl
diff --git a/m4/diff.m4 b/m4/diff.m4
deleted file mode 100644
index 44996fb..0000000
--- a/m4/diff.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-dnl file      : m4/diff.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl DIFF_TOOL
-dnl
-AC_DEFUN([DIFF_TOOL], [
-diff_found=no
-
-AC_ARG_VAR([DIFF],[diff command])
-AC_ARG_VAR([DIFFFLAGS],[diff flags])
-
-AC_ARG_WITH(
-  [diff],
-  [AC_HELP_STRING([--with-diff=PATH],[path to the diff program])],
-  [diff_path=${withval}],
-  [diff_path=])
-
-AC_MSG_CHECKING([for diff])
-
-if test x"$DIFF" = x; then
- if test x"$diff_path" != x; then
-   AS_SET_CATFILE([abs_diff_path], [$ac_pwd], [$diff_path])
-   DIFF="$abs_diff_path"
- else
-   DIFF=diff
- fi
-fi
-
-cat >conftest.txt
-
-$DIFF conftest.txt conftest.txt 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$DIFF])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([diff command is not found; consider setting the DIFF variable or using --with-diff=PATH])
-fi
-
-AC_MSG_CHECKING([whether $DIFF accepts -u])
-
-$DIFF -u conftest.txt conftest.txt 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([yes])
-  DIFFFLAGS="$DIFFFLAGS -u"
-else
-  AC_MSG_RESULT([no])
-fi
-
-rm -f conftest.txt
-
-])dnl
diff --git a/m4/libboost.m4 b/m4/libboost.m4
deleted file mode 100644
index 2223493..0000000
--- a/m4/libboost.m4
+++ /dev/null
@@ -1,184 +0,0 @@
-dnl file      : m4/libboost.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBBOOST([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBBOOST], [
-libboost_found=no
-
-AC_MSG_CHECKING([for boost base headers])
-
-AC_ARG_WITH(
-  [boost],
-  [AC_HELP_STRING([--with-boost=DIR],[location of boost build directory])],
-  [libboost_dir=${withval}],
-  [libboost_dir=])
-
-# If libboost_dir was given, add the necessary preprocessor and linker flags.
-#
-if test x"$libboost_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libboost_dir], [$ac_pwd], [$libboost_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libboost_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libboost_dir/stage/lib"
-fi
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <boost/version.hpp>
-
-#ifndef BOOST_VERSION
-#  error BOOST_VERSION not defined
-#endif
-
-int
-main ()
-{
-}
-])],
-[
-libboost_found=yes
-])
-
-if test x"$libboost_found" = xno; then
-  if test x"$libboost_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libboost_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
-dnl
-dnl LIBBOOST_HEADER_LIB(NAME, SOURCE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-AC_DEFUN([LIBBOOST_HEADER_LIB], [
-libboost_$1_found=no
-
-AC_MSG_CHECKING([for boost $1 library])
-CXX_LIBTOOL_LINK_IFELSE([$2],[libboost_$1_found=yes])
-
-if test x"$libboost_$1_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  [$3]
-else
-  AC_MSG_RESULT([no])
-  [$4]
-fi
-])dnl
-dnl
-dnl LIBBOOST_LIB(NAME, SOURCE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-AC_DEFUN([LIBBOOST_LIB], [
-libboost_$1_found=no
-
-AC_MSG_CHECKING([for boost $1 library])
-
-save_LIBS="$LIBS"
-LIBS="-lboost_$1 $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([$2],[libboost_$1_found=yes])
-
-# Try to fall back on the -mt version for backwards-compatibility.
-#
-if test x"$libboost_$1_found" = xno; then
-   LIBS="-lboost_$1-mt $save_LIBS"
-   CXX_LIBTOOL_LINK_IFELSE([$2],[libboost_$1_found=yes])
-fi
-
-if test x"$libboost_$1_found" = xno; then
-  LIBS="$save_LIBS"
-fi
-
-if test x"$libboost_$1_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  [$3]
-else
-  AC_MSG_RESULT([no])
-  [$4]
-fi
-])dnl
-dnl
-dnl LIBBOOST_SMART_PTR([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([LIBBOOST_SMART_PTR], [
-LIBBOOST_HEADER_LIB([smart_ptr],[
-AC_LANG_SOURCE([
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-int
-main ()
-{
-  boost::shared_ptr<int> sp (new int (10));
-  boost::weak_ptr<int> wp (sp);
-}
-])],
-[$1],
-[$2])
-])dnl
-dnl
-dnl LIBBOOST_UNORDERED([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([LIBBOOST_UNORDERED], [
-LIBBOOST_HEADER_LIB([unordered],[
-AC_LANG_SOURCE([
-#include <boost/unordered_set.hpp>
-#include <boost/unordered_map.hpp>
-
-int
-main ()
-{
-  boost::unordered_set<int> s;
-  boost::unordered_map<int, int> m;
-
-  s.insert (1);
-  return m.find (1) != m.end ();
-}
-])],
-[$1],
-[$2])
-])dnl
-dnl
-dnl LIBBOOST_SYSTEM([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([LIBBOOST_SYSTEM], [
-LIBBOOST_LIB([system],[
-AC_LANG_SOURCE([
-int
-main ()
-{
-}
-])],
-[$1],
-[$2])
-])dnl
-dnl
-dnl LIBBOOST_DATE_TIME([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([LIBBOOST_DATE_TIME], [
-LIBBOOST_LIB([date_time],[
-AC_LANG_SOURCE([
-#include <boost/date_time/gregorian/gregorian.hpp>
-
-int
-main ()
-{
-  boost::gregorian::greg_month m (1);
-  const char* s (m.as_short_string ());
-  return s == 0;
-}
-])],
-[$1],
-[$2])
-])dnl
diff --git a/m4/libodb-boost.m4 b/m4/libodb-boost.m4
deleted file mode 100644
index 454bd90..0000000
--- a/m4/libodb-boost.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-boost.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_BOOST([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_BOOST], [
-libodb_boost_found=no
-
-AC_ARG_WITH(
-  [libodb-boost],
-  [AC_HELP_STRING([--with-libodb-boost=DIR],[location of libodb-boost build directory])],
-  [libodb_boost_dir=${withval}],
-  [libodb_boost_dir=])
-
-AC_MSG_CHECKING([for libodb-boost])
-
-# If libodb_boost_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_boost_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_boost_dir], [$ac_pwd], [$libodb_boost_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_boost_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_boost_dir/odb/boost"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-boost $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/boost/exception.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::boost::exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_boost_found=yes])
-
-if test x"$libodb_boost_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_boost_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_boost_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-mssql.m4 b/m4/libodb-mssql.m4
deleted file mode 100644
index 7ab52d8..0000000
--- a/m4/libodb-mssql.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-mssql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_MSSQL([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_MSSQL], [
-libodb_mssql_found=no
-
-AC_ARG_WITH(
-  [libodb-mssql],
-  [AC_HELP_STRING([--with-libodb-mssql=DIR],[location of libodb-mssql build directory])],
-  [libodb_mssql_dir=${withval}],
-  [libodb_mssql_dir=])
-
-AC_MSG_CHECKING([for libodb-mssql])
-
-# If libodb_mssql_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_mssql_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_mssql_dir], [$ac_pwd], [$libodb_mssql_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_mssql_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_mssql_dir/odb/mssql"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-mssql $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/mssql/exceptions.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::mssql::database_exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_mssql_found=yes])
-
-if test x"$libodb_mssql_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_mssql_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_mssql_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-mysql.m4 b/m4/libodb-mysql.m4
deleted file mode 100644
index f0f6d1b..0000000
--- a/m4/libodb-mysql.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-mysql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_MYSQL([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_MYSQL], [
-libodb_mysql_found=no
-
-AC_ARG_WITH(
-  [libodb-mysql],
-  [AC_HELP_STRING([--with-libodb-mysql=DIR],[location of libodb-mysql build directory])],
-  [libodb_mysql_dir=${withval}],
-  [libodb_mysql_dir=])
-
-AC_MSG_CHECKING([for libodb-mysql])
-
-# If libodb_mysql_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_mysql_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_mysql_dir], [$ac_pwd], [$libodb_mysql_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_mysql_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_mysql_dir/odb/mysql"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-mysql $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/mysql/exceptions.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::mysql::database_exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_mysql_found=yes])
-
-if test x"$libodb_mysql_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_mysql_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_mysql_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-oracle.m4 b/m4/libodb-oracle.m4
deleted file mode 100644
index 10028ff..0000000
--- a/m4/libodb-oracle.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-oracle.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_ORACLE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_ORACLE], [
-libodb_oracle_found=no
-
-AC_ARG_WITH(
-  [libodb-oracle],
-  [AC_HELP_STRING([--with-libodb-oracle=DIR],[location of libodb-oracle build directory])],
-  [libodb_oracle_dir=${withval}],
-  [libodb_oracle_dir=])
-
-AC_MSG_CHECKING([for libodb-oracle])
-
-# If libodb_oracle_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_oracle_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_oracle_dir], [$ac_pwd], [$libodb_oracle_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_oracle_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_oracle_dir/odb/oracle"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-oracle $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/oracle/exceptions.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::oracle::database_exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_oracle_found=yes])
-
-if test x"$libodb_oracle_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_oracle_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_oracle_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-pgsql.m4 b/m4/libodb-pgsql.m4
deleted file mode 100644
index cd6495d..0000000
--- a/m4/libodb-pgsql.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-pgsql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_PGSQL([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_PGSQL], [
-libodb_pgsql_found=no
-
-AC_ARG_WITH(
-  [libodb-pgsql],
-  [AC_HELP_STRING([--with-libodb-pgsql=DIR],[location of libodb-pgsql build directory])],
-  [libodb_pgsql_dir=${withval}],
-  [libodb_pgsql_dir=])
-
-AC_MSG_CHECKING([for libodb-pgsql])
-
-# If libodb_pgsql_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_pgsql_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_pgsql_dir], [$ac_pwd], [$libodb_pgsql_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_pgsql_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_pgsql_dir/odb/pgsql"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-pgsql $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/pgsql/exceptions.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::pgsql::database_exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_pgsql_found=yes])
-
-if test x"$libodb_pgsql_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_pgsql_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_pgsql_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-qt.m4 b/m4/libodb-qt.m4
deleted file mode 100644
index 76ebfb3..0000000
--- a/m4/libodb-qt.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-qt.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_QT([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_QT], [
-libodb_qt_found=no
-
-AC_ARG_WITH(
-  [libodb-qt],
-  [AC_HELP_STRING([--with-libodb-qt=DIR],[location of libodb-qt build directory])],
-  [libodb_qt_dir=${withval}],
-  [libodb_qt_dir=])
-
-AC_MSG_CHECKING([for libodb-qt])
-
-# If libodb_qt_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_qt_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_qt_dir], [$ac_pwd], [$libodb_qt_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_qt_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_qt_dir/odb/qt"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-qt $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/qt/exception.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::qt::exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_qt_found=yes])
-
-if test x"$libodb_qt_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_qt_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_qt_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-fi
-])dnl
diff --git a/m4/libodb-sqlite.m4 b/m4/libodb-sqlite.m4
deleted file mode 100644
index 46ea966..0000000
--- a/m4/libodb-sqlite.m4
+++ /dev/null
@@ -1,82 +0,0 @@
-dnl file      : m4/libodb-sqlite.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl LIBODB_SQLITE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBODB_SQLITE], [
-libodb_sqlite_found=no
-
-AC_ARG_WITH(
-  [libodb-sqlite],
-  [AC_HELP_STRING([--with-libodb-sqlite=DIR],[location of libodb-sqlite build directory])],
-  [libodb_sqlite_dir=${withval}],
-  [libodb_sqlite_dir=])
-
-AC_MSG_CHECKING([for libodb-sqlite])
-
-# If libodb_sqlite_dir was given, add the necessary preprocessor and
-# linker flags.
-#
-if test x"$libodb_sqlite_dir" != x; then
-  save_CPPFLAGS="$CPPFLAGS"
-  save_LDFLAGS="$LDFLAGS"
-
-  AS_SET_CATFILE([abs_libodb_sqlite_dir], [$ac_pwd], [$libodb_sqlite_dir])
-
-  CPPFLAGS="$CPPFLAGS -I$abs_libodb_sqlite_dir"
-  LDFLAGS="$LDFLAGS -L$abs_libodb_sqlite_dir/odb/sqlite"
-fi
-
-save_LIBS="$LIBS"
-LIBS="-lodb-sqlite $LIBS"
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/sqlite/exceptions.hxx>
-
-void
-f ()
-{
-}
-
-const char*
-g ()
-{
-  try
-  {
-    f ();
-  }
-  catch (const odb::sqlite::database_exception& e)
-  {
-    return e.what ();
-  }
-  return 0;
-}
-
-int
-main ()
-{
-  const char* m (g ());
-  return m != 0;
-}
-])],
-[libodb_sqlite_found=yes])
-
-if test x"$libodb_sqlite_found" = xno; then
-  LIBS="$save_LIBS"
-
-  if test x"$libodb_sqlite_dir" != x; then
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-  fi
-fi
-
-if test x"$libodb_sqlite_found" = xyes; then
-  AC_MSG_RESULT([yes])
-  $1
-else
-  AC_MSG_RESULT([no])
-  $2
-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/libqt.m4 b/m4/libqt.m4
deleted file mode 100644
index c2be2e7..0000000
--- a/m4/libqt.m4
+++ /dev/null
@@ -1,121 +0,0 @@
-dnl file      : m4/libqt.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl
-dnl LIBQTCORE_COMPILE()
-dnl
-AC_DEFUN([LIBQTCORE_COMPILE], [
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-// See libodb-qt/odb/qt/details/config.hxx for more information on
-// what's going on here.
-//
-#  if defined(__ELF__) && !defined(__PIC__) && !defined(__PIE__)
-#    include <QtCore/qconfig.h> // QT_REDUCE_RELOCATIONS
-#    ifdef QT_REDUCE_RELOCATIONS
-#      define __PIE__
-#    endif
-#  endif
-#include <string>
-#include <QtCore/QString>
-
-int
-main ()
-{
-  QString qs ("test");
-  std::string ss (qs.toStdString ());
-  return ss.size () != 0;
-}
-])],
-[libqt_found=yes])
-])dnl
-dnl
-dnl LIBQTCORE([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
-dnl
-dnl
-AC_DEFUN([LIBQTCORE], [
-libqt_found=no
-
-# QtCore libraries and pkg-config names in the order we should try
-# them.
-#
-libqt_lib_names="Qt5Core QtCore5 QtCore Qt4Core QtCore4"
-libqt_pkg_names="Qt5Core QtCore"
-
-AC_PATH_PROG([pkg_config],[pkg-config])
-
-AC_MSG_CHECKING([for QtCore])
-
-# First check for QtCore using default CPPFLAGS/LDFLAGS/LIBS. This
-# test allows the user to override the QtCore library name (e.g.,
-# QtCored4, Qt5Core) via the LIBS variable.
-#
-LIBQTCORE_COMPILE
-
-# Then check for QtCore using default CPPFLAGS/LDFLAGS.
-#
-if test x"$libqt_found" = xno; then
-  for lib in $libqt_lib_names; do
-    save_LIBS="$LIBS"
-    LIBS="-l$lib $LIBS"
-
-    LIBQTCORE_COMPILE
-
-    if test x"$libqt_found" = xno; then
-      LIBS="$save_LIBS"
-    else
-      break
-    fi
-  done
-fi
-
-# Try framework in case we are on Mac OS X.
-#
-if test x"$libqt_found" = xno; then
-  save_LIBS="$LIBS"
-  LIBS="-framework QtCore $LIBS"
-
-  LIBQTCORE_COMPILE
-
-  if test x"$libqt_found" = xno; then
-    LIBS="$save_LIBS"
-  fi
-fi
-
-# If default CPPFLAGS/LDFLAGS didn't work, try to discover
-# them using pkg-config.
-#
-if test x"$libqt_found" = xno; then
-  if test x"$pkg_config" != x; then
-    for pkg in $libqt_pkg_names; do
-      if $pkg_config --exists $pkg; then
-        save_CPPFLAGS="$CPPFLAGS"
-        save_LIBS="$LIBS"
-
-        CPPFLAGS=`$pkg_config --cflags $pkg`
-        LIBS=`$pkg_config --libs $pkg`
-
-        CPPFLAGS="$CPPFLAGS $save_CPPFLAGS"
-        LIBS="$LIBS $save_LIBS"
-
-        LIBQTCORE_COMPILE
-
-        if test x"$libqt_found" = xno; then
-          CPPFLAGS="$save_CPPFLAGS"
-          LIBS="$save_LIBS"
-        else
-          break
-        fi
-      fi
-    done
-  fi
-fi
-
-if test x"$libqt_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/mssql.m4 b/m4/mssql.m4
deleted file mode 100644
index 5debeb2..0000000
--- a/m4/mssql.m4
+++ /dev/null
@@ -1,224 +0,0 @@
-dnl file      : m4/mssql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl MSSQL
-dnl
-AC_DEFUN([MSSQL], [
-
-# Client.
-#
-AC_MSG_CHECKING([for mssql client program])
-AC_ARG_WITH(
-  [mssql-client],
-  [AC_HELP_STRING([--with-mssql-client=PATH], [SQL Server client program path (sqlcmd by default)])],
-  [case $withval in
-     yes)
-       mssql_client=sqlcmd
-       ;;
-     no)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([need mssql client to run the tests])
-       ;;
-     *)
-       mssql_client=$withval
-       ;;
-   esac],
-  [mssql_client=sqlcmd])
-
-$mssql_client -? 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$mssql_client])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([mssql client is not found; consider using --with-mssql-client=PATH])
-fi
-
-# User. If 'no' is specified, then use Windows authentication.
-#
-AC_MSG_CHECKING([for mssql database user])
-AC_ARG_WITH(
-  [mssql-user],
-  [AC_HELP_STRING([--with-mssql-user=NAME], [SQL Server database user (odb_test by default)])],
-  [case $withval in
-     yes)
-       mssql_user=odb_test
-       mssql_user_set=yes
-       ;;
-     no)
-       mssql_user_set=no
-       ;;
-     *)
-       mssql_user=$withval
-       mssql_user_set=yes
-       ;;
-   esac],
-  [mssql_user=odb_test
-   mssql_user_set=yes])
-
-if test x$mssql_user_set = xyes; then
-  AC_MSG_RESULT(['$mssql_user'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Password. Can be left unspecified if using Windows authentication.
-#
-AC_MSG_CHECKING([for mssql database password])
-AC_ARG_WITH(
-  [mssql-password],
-  [AC_HELP_STRING([--with-mssql-password=PASS], [SQL Server database password (odb_test by default)])],
-  [case $withval in
-     yes)
-       mssql_password=odb_test
-       mssql_password_set=yes
-       ;;
-     no)
-       mssql_password_set=no
-       ;;
-     *)
-       mssql_password=$withval
-       mssql_password_set=yes
-       ;;
-   esac],
-  [mssql_password_set=no])
-
-if test x$mssql_password_set = xyes; then
-  AC_MSG_RESULT(['$mssql_password'])
-elif test x$mssql_user = xodb_test; then
-  mssql_password=odb_test
-  mssql_password_set=yes
-  AC_MSG_RESULT(['$mssql_password'])
-else
-  AC_MSG_RESULT([none])
-  if test x$mssql_user_set = xyes; then
-    AC_MSG_ERROR([password not specified; SQL Server requires a password (--with-mssql-password=PASS)])
-  fi
-fi
-
-# Database. If not specified, use the user's default.
-#
-AC_MSG_CHECKING([for mssql database name])
-AC_ARG_WITH(
-  [mssql-db],
-  [AC_HELP_STRING([--with-mssql-db=NAME], [SQL Server database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
-  [case $withval in
-     yes)
-       mssql_db=odb_test
-       mssql_db_set=yes
-       ;;
-     no)
-       mssql_db_set=no
-       ;;
-     *)
-       mssql_db=$withval
-       mssql_db_set=yes
-       ;;
-   esac],
-  [mssql_db=odb_test
-   mssql_db_set=yes])
-
-if test x$mssql_db_set = xyes; then
-  AC_MSG_RESULT(['$mssql_db'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Server.
-#
-AC_MSG_CHECKING([for mssql instance address])
-AC_ARG_WITH(
-  [mssql-server],
-  [AC_HELP_STRING([--with-mssql-server=ADDR], [SQL Server instance address])],
-  [case $withval in
-     yes | no)
-       mssql_server_set=no
-       ;;
-     *)
-       mssql_server=$withval
-       mssql_server_set=yes
-       ;;
-   esac],
-  [mssql_server_set=no])
-
-if test x$mssql_server_set = xyes; then
-  AC_MSG_RESULT(['$mssql_server'])
-else
-  AC_MSG_RESULT([none])
-  AC_MSG_ERROR([instance address not specified; SQL Server instance address is required (--with-mssql-server=ADDR)])
-fi
-
-# Driver.
-#
-AC_MSG_CHECKING([for mssql native client odbc driver])
-AC_ARG_WITH(
-  [mssql-driver],
-  [AC_HELP_STRING([--with-mssql-driver=NAME], [SQL Server Native Client ODBC driver (latest available by default)])],
-  [case $withval in
-     yes | no)
-       mssql_driver_set=no
-       ;;
-     *)
-       mssql_driver=$withval
-       mssql_driver_set=yes
-       ;;
-   esac],
-  [mssql_driver_set=no])
-
-if test x$mssql_driver_set = xyes; then
-  AC_MSG_RESULT(['$mssql_driver'])
-else
-  AC_MSG_RESULT([latest])
-fi
-
-# Create options file.
-#
-AC_CONFIG_COMMANDS([mssql.options],
- [
-   rm -f mssql.options
-   echo '#! /bin/sh' >mssql-driver
-
-   echo 'opt=' >>mssql-driver
-
-   if test x$mssql_user_set = xyes; then
-     echo "--user '$mssql_user'" >>mssql.options
-     echo 'opt="$opt -U '"$mssql_user"'"' >>mssql-driver
-
-     echo "--password '$mssql_password'" >>mssql.options
-     echo 'opt="$opt -P '"$mssql_password"'"' >>mssql-driver
-   fi
-
-   if test x$mssql_db_set = xyes; then
-     echo "--database '$mssql_db'" >>mssql.options
-     echo 'opt="$opt -d '"$mssql_db"'"' >>mssql-driver
-   fi
-
-   echo "--server '$mssql_server'" >>mssql.options
-   echo 'opt="$opt -S '"$mssql_server"'"' >>mssql-driver
-
-   if test x$mssql_driver_set = xyes; then
-     echo "--driver '$mssql_driver'" >>mssql.options
-   fi
-
-   echo 'opt="$opt -x -r -b"' >>mssql-driver
-   echo 'if test x$[]1 != x; then' >>mssql-driver
-   echo "  exec $mssql_client "'$opt -i $[]1' >>mssql-driver
-   echo "else" >>mssql-driver
-   echo "  exec $mssql_client "'$opt' >>mssql-driver
-   echo "fi" >>mssql-driver
-
-   chmod +x mssql-driver
- ],
- [
-  mssql_client="$mssql_client"
-  mssql_user="$mssql_user"
-  mssql_user_set="$mssql_user_set"
-  mssql_password="$mssql_password"
-  mssql_db="$mssql_db"
-  mssql_db_set="$mssql_db_set"
-  mssql_server="$mssql_server"
-  mssql_driver="$mssql_driver"
-  mssql_driver_set="$mssql_driver_set"
- ])
-
-])dnl
diff --git a/m4/mysql.m4 b/m4/mysql.m4
deleted file mode 100644
index 7564726..0000000
--- a/m4/mysql.m4
+++ /dev/null
@@ -1,270 +0,0 @@
-dnl file      : m4/mysql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl MYSQL
-dnl
-AC_DEFUN([MYSQL], [
-
-# Client.
-#
-AC_MSG_CHECKING([for mysql client program])
-AC_ARG_WITH(
-  [mysql-client],
-  [AC_HELP_STRING([--with-mysql-client=PATH], [MySQL client program path (mysql by default)])],
-  [case $withval in
-     yes)
-       mysql_client=mysql
-       ;;
-     no)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([need mysql client to run the tests])
-       ;;
-     *)
-       mysql_client=$withval
-       ;;
-   esac],
-  [mysql_client=mysql])
-
-$mysql_client --version 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$mysql_client])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([mysql client is not found; consider using --with-mysql-client=PATH])
-fi
-
-# User.
-#
-AC_MSG_CHECKING([for mysql database user])
-AC_ARG_WITH(
-  [mysql-user],
-  [AC_HELP_STRING([--with-mysql-user=NAME], [MySQL database user (odb_test by default)])],
-  [case $withval in
-     yes)
-       mysql_user=odb_test
-       mysql_user_set=yes
-       ;;
-     no)
-       mysql_user_set=no
-       ;;
-     *)
-       mysql_user=$withval
-       mysql_user_set=yes
-       ;;
-   esac],
-  [mysql_user=odb_test
-   mysql_user_set=yes])
-
-if test x$mysql_user_set = xyes; then
-  AC_MSG_RESULT(['$mysql_user'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Password.
-#
-AC_MSG_CHECKING([for mysql database password])
-AC_ARG_WITH(
-  [mysql-password],
-  [AC_HELP_STRING([--with-mysql-password=PASS], [MySQL database password (no password by default)])],
-  [case $withval in
-     yes)
-       mysql_password=
-       mysql_password_set=yes
-       ;;
-     no)
-       mysql_password_set=no
-       ;;
-     *)
-       mysql_password=$withval
-       mysql_password_set=yes
-       ;;
-   esac],
-  [mysql_password_set=no])
-
-if test x$mysql_password_set = xyes; then
-  AC_MSG_RESULT(['$mysql_password'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Database name.
-#
-AC_MSG_CHECKING([for mysql database name])
-AC_ARG_WITH(
-  [mysql-db],
-  [AC_HELP_STRING([--with-mysql-db=NAME], [MySQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
-  [case $withval in
-     yes)
-       mysql_db=odb_test
-       mysql_db_set=yes
-       ;;
-     no)
-       mysql_db_set=no
-       ;;
-     *)
-       mysql_db=$withval
-       mysql_db_set=yes
-       ;;
-   esac],
-  [mysql_db=odb_test
-   mysql_db_set=yes])
-
-if test x$mysql_db_set = xyes; then
-  AC_MSG_RESULT(['$mysql_db'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Host.
-#
-AC_MSG_CHECKING([for mysql database host])
-AC_ARG_WITH(
-  [mysql-host],
-  [AC_HELP_STRING([--with-mysql-host=HOST], [MySQL database host (localhost by default)])],
-  [case $withval in
-     yes)
-       mysql_host=localhost
-       mysql_host_set=yes
-       ;;
-     no)
-       mysql_host_set=no
-       ;;
-     *)
-       mysql_host=$withval
-       mysql_host_set=yes
-       ;;
-   esac],
-  [mysql_host_set=no])
-
-if test x$mysql_host_set = xyes; then
-  AC_MSG_RESULT(['$mysql_host'])
-else
-  AC_MSG_RESULT([localhost])
-fi
-
-# Port.
-#
-AC_MSG_CHECKING([for mysql database port])
-AC_ARG_WITH(
-  [mysql-port],
-  [AC_HELP_STRING([--with-mysql-port=PORT], [MySQL database port (standard MySQL port by default)])],
-  [case $withval in
-     yes)
-       mysql_port=0
-       mysql_port_set=yes
-       ;;
-     no)
-       mysql_port_set=no
-       ;;
-     *)
-       mysql_port=$withval
-       mysql_port_set=yes
-       ;;
-   esac],
-  [mysql_port_set=no])
-
-if test x$mysql_port_set = xyes; then
-  AC_MSG_RESULT(['$mysql_port'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Socket.
-#
-AC_MSG_CHECKING([for mysql database socket])
-AC_ARG_WITH(
-  [mysql-socket],
-  [AC_HELP_STRING([--with-mysql-socket=SOCKET], [MySQL database socket (standard MySQL socket by default)])],
-  [case $withval in
-     yes)
-       mysql_socket=
-       mysql_socket_set=yes
-       ;;
-     no)
-       mysql_socket_set=no
-       ;;
-     *)
-       mysql_socket=$withval
-       mysql_socket_set=yes
-       ;;
-   esac],
-  [mysql_socket_set=no])
-
-if test x$mysql_socket_set = xyes; then
-  AC_MSG_RESULT(['$mysql_socket'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Create options file.
-#
-AC_CONFIG_COMMANDS([mysql.options],
- [
-   rm -f mysql.options
-   echo '#! /bin/sh' >mysql-driver
-
-   echo 'opt=' >>mysql-driver
-
-   if test x$mysql_user_set = xyes; then
-     echo "--user '$mysql_user'" >>mysql.options
-     echo 'opt="$opt --user='"$mysql_user"'"' >>mysql-driver
-   fi
-
-   if test x$mysql_password_set = xyes; then
-     echo "--password '$mysql_password'" >>mysql.options
-     echo 'opt="$opt --password='"$mysql_password"'"' >>mysql-driver
-   fi
-
-   if test x$mysql_db_set = xyes; then
-     echo "--database '$mysql_db'" >>mysql.options
-     echo 'opt="$opt --database='"$mysql_db"'"' >>mysql-driver
-   fi
-
-   if test x$mysql_host_set = xyes; then
-     echo "--host '$mysql_host'" >>mysql.options
-     echo 'opt="$opt --host='"$mysql_host"'"' >>mysql-driver
-   fi
-
-   if test x$mysql_port_set = xyes; then
-     echo "--port '$mysql_port'" >>mysql.options
-     echo 'opt="$opt --port='"$mysql_port"'"' >>mysql-driver
-   fi
-
-   if test x$mysql_socket_set = xyes; then
-     echo "--socket '$mysql_socket'" >>mysql.options
-     echo 'opt="$opt --socket='"$mysql_socket"'"' >>mysql-driver
-   fi
-
-   echo 'if test x$[]1 != x; then' >>mysql-driver
-   echo "  exec $mysql_client "'$opt <$[]1' >>mysql-driver
-   echo "else" >>mysql-driver
-   echo "  exec $mysql_client "'$opt' >>mysql-driver
-   echo "fi" >>mysql-driver
-
-   chmod +x mysql-driver
- ],
- [
-  mysql_client="$mysql_client"
-
-  mysql_user="$mysql_user"
-  mysql_user_set="$mysql_user_set"
-
-  mysql_password="$mysql_password"
-  mysql_password_set="$mysql_password_set"
-
-  mysql_db="$mysql_db"
-  mysql_db_set="$mysql_db_set"
-
-  mysql_host="$mysql_host"
-  mysql_host_set="$mysql_host_set"
-
-  mysql_port="$mysql_port"
-  mysql_port_set="$mysql_port_set"
-
-  mysql_socket="$mysql_socket"
-  mysql_socket_set="$mysql_socket_set"
- ])
-
-])dnl
diff --git a/m4/odb.m4 b/m4/odb.m4
deleted file mode 100644
index 3e1b19b..0000000
--- a/m4/odb.m4
+++ /dev/null
@@ -1,43 +0,0 @@
-dnl file      : m4/odb.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl ODB_COMPILER([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-dnl
-AC_DEFUN([ODB_COMPILER], [
-odb_found=no
-
-AC_ARG_VAR([ODB],[ODB compiler command])
-AC_ARG_VAR([ODBFLAGS],[ODB compiler flags])
-AC_ARG_VAR([ODBCPPFLAGS],[ODB-specific C++ preprocessor flags])
-
-AC_ARG_WITH(
-  [odb],
-  [AC_HELP_STRING([--with-odb=DIR],[location of odb compiler build directory])],
-  [odb_dir=${withval}],
-  [odb_dir=])
-
-AC_MSG_CHECKING([for odb])
-
-save_ODB="$ODB"
-
-if test x"$ODB" = x; then
- if test x"$odb_dir" != x; then
-   AS_SET_CATFILE([abs_odb_dir], [$ac_pwd], [$odb_dir])
-   ODB="$abs_odb_dir/odb/odb"
- else
-   ODB=odb
- fi
-fi
-
-$ODB --version 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$ODB])
-  $1
-else
-  AC_MSG_RESULT([no])
-  ODB="$save_ODB"
-  $2
-fi
-
-])dnl
diff --git a/m4/oracle.m4 b/m4/oracle.m4
deleted file mode 100644
index c095214..0000000
--- a/m4/oracle.m4
+++ /dev/null
@@ -1,243 +0,0 @@
-dnl file      : m4/oracle.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl ORACLE
-dnl
-AC_DEFUN([ORACLE], [
-
-# Client.
-#
-AC_MSG_CHECKING([for oracle client program])
-AC_ARG_WITH(
-  [oracle-client],
-  [AC_HELP_STRING([--with-oracle-client=PATH], [Oracle client program path (sqlplus by default)])],
-  [case $withval in
-     yes)
-       oracle_client=sqlplus
-       ;;
-     no)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([need oracle client to run the tests])
-       ;;
-     *)
-       oracle_client=$withval
-       ;;
-   esac],
-  [oracle_client=sqlplus])
-
-$oracle_client -V 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$oracle_client])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([oracle client is not found; consider using --with-oracle-client=PATH])
-fi
-
-# User.
-#
-AC_MSG_CHECKING([for oracle database user])
-AC_ARG_WITH(
-  [oracle-user],
-  [AC_HELP_STRING([--with-oracle-user=NAME], [Oracle database user (odb_test by default)])],
-  [case $withval in
-     yes)
-       oracle_user=odb_test
-       oracle_user_set=yes
-       ;;
-     no)
-       oracle_user_set=no
-       ;;
-     *)
-       oracle_user=$withval
-       oracle_user_set=yes
-       ;;
-   esac],
-  [oracle_user=odb_test
-   oracle_user_set=yes])
-
-if test x$oracle_user_set = xyes; then
-  AC_MSG_RESULT(['$oracle_user'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Password.
-#
-AC_MSG_CHECKING([for oracle database password])
-AC_ARG_WITH(
-  [oracle-password],
-  [AC_HELP_STRING([--with-oracle-password=PASS], [Oracle database password (odb_test by default)])],
-  [case $withval in
-     yes)
-       oracle_password=odb_test
-       oracle_password_set=yes
-       ;;
-     no)
-       oracle_password_set=no
-       ;;
-     *)
-       oracle_password=$withval
-       oracle_password_set=yes
-       ;;
-   esac],
-  [oracle_password_set=no])
-
-if test x$oracle_password_set = xyes; then
-  AC_MSG_RESULT(['$oracle_password'])
-elif test x$oracle_user = xodb_test; then
-  oracle_password=odb_test
-  oracle_password_set=yes
-  AC_MSG_RESULT(['$oracle_password'])
-elif test x$oracle_user != x/; then
-  AC_MSG_RESULT([none])
-  AC_MSG_ERROR([password not specified; Oracle requires a password (--with-oracle-password=PASS)])
-fi
-
-# Service name.
-#
-AC_MSG_CHECKING([for oracle service name])
-AC_ARG_WITH(
-  [oracle-service],
-  [AC_HELP_STRING([--with-oracle-service=NAME], [Oracle service name (default service if left empty). Note that all data associated with this user on this service WILL BE LOST!])],
-  [case $withval in
-     yes)
-       oracle_service=
-       oracle_service_set=yes
-       ;;
-     no)
-       oracle_service_set=no
-       ;;
-     *)
-       oracle_service=$withval
-       oracle_service_set=yes
-       ;;
-   esac],
-  [oracle_service_set=no])
-
-if test x$oracle_service_set = xyes; then
-  AC_MSG_RESULT(['$oracle_service'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Host.
-#
-AC_MSG_CHECKING([for oracle database host])
-AC_ARG_WITH(
-  [oracle-host],
-  [AC_HELP_STRING([--with-oracle-host=HOST], [Oracle database host (localhost by default)])],
-  [case $withval in
-     yes)
-       oracle_host=localhost
-       oracle_host_set=yes
-       ;;
-     no)
-       oracle_host_set=no
-       ;;
-     *)
-       oracle_host=$withval
-       oracle_host_set=yes
-       ;;
-   esac],
-  [oracle_host_set=no])
-
-if test x$oracle_host_set = xyes; then
-  AC_MSG_RESULT(['$oracle_host'])
-else
-  AC_MSG_RESULT([localhost])
-fi
-
-# Port.
-#
-AC_MSG_CHECKING([for oracle database port])
-AC_ARG_WITH(
-  [oracle-port],
-  [AC_HELP_STRING([--with-oracle-port=PORT], [Oracle database port (standard Oracle port by default)])],
-  [case $withval in
-     yes)
-       oracle_port=1521
-       oracle_port_set=yes
-       ;;
-     no)
-       oracle_port_set=no
-       ;;
-     *)
-       oracle_port=$withval
-       oracle_port_set=yes
-       ;;
-   esac],
-  [oracle_port_set=no])
-
-if test x$oracle_port_set = xyes; then
-  AC_MSG_RESULT(['$oracle_port'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Create options file.
-#
-AC_CONFIG_COMMANDS([oracle.options],
- [
-   rm -f oracle.options
-   echo '#! /bin/sh' >oracle-driver
-
-   echo 'conn_str=' >>oracle-driver
-
-   if test x$oracle_user_set = xyes; then
-     echo "--user '$oracle_user'" >>oracle.options
-     echo 'conn_str="'"$oracle_user"'"' >>oracle-driver
-   fi
-
-   if test x$oracle_password_set = xyes; then
-     echo "--password '$oracle_password'" >>oracle.options
-     echo 'conn_str="$conn_str/'"$oracle_password"'"' >>oracle-driver
-   fi
-
-   if test x$oracle_host_set = xyes; then
-     echo "--host '$oracle_host'" >>oracle.options
-     echo 'conn_str="$conn_str@//'"$oracle_host"'"' >>oracle-driver
-
-     if test x$oracle_port_set = xyes; then
-       echo "--port '$oracle_port'" >>oracle.options
-       echo 'conn_str="$conn_str:'"$oracle_port"'"' >>oracle-driver
-     fi
-   fi
-
-   if test x$oracle_service != x; then
-     if test x$oracle_host_set = xno; then
-       echo 'conn_str="$conn_str@"' >>oracle-driver
-     fi
-
-     echo "--service '$oracle_service'" >>oracle.options
-     echo 'conn_str="$conn_str/'"$oracle_service"'"' >>oracle-driver
-   fi
-
-   echo 'if test x$[]1 != x; then' >>oracle-driver
-   echo "  exec $oracle_client -L -S "'$conn_str @$[]1' >>oracle-driver
-   echo "else" >>oracle-driver
-   echo "  exec $oracle_client -L -S "'$conn_str' >>oracle-driver
-   echo "fi" >>oracle-driver
-
-   chmod +x oracle-driver
- ],
- [
-  oracle_client="$oracle_client"
-
-  oracle_user="$oracle_user"
-  oracle_user_set="$oracle_user_set"
-
-  oracle_password="$oracle_password"
-  oracle_password_set="$oracle_password_set"
-
-  oracle_service="$oracle_service"
-  oracle_service_set="$oracle_service_set"
-
-  oracle_host="$oracle_host"
-  oracle_host_set="$oracle_host_set"
-
-  oracle_port="$oracle_port"
-  oracle_port_set="$oracle_port_set"
- ])
-
-])dnl
diff --git a/m4/pgsql.m4 b/m4/pgsql.m4
deleted file mode 100644
index eb29a62..0000000
--- a/m4/pgsql.m4
+++ /dev/null
@@ -1,204 +0,0 @@
-dnl file      : m4/pgsql.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl PGSQL
-dnl
-AC_DEFUN([PGSQL], [
-
-# Client.
-#
-AC_MSG_CHECKING([for pgsql client program])
-AC_ARG_WITH(
-  [pgsql-client],
-  [AC_HELP_STRING([--with-pgsql-client=PATH], [PostgreSQL client program path (psql by default)])],
-  [case $withval in
-     yes)
-       pgsql_client=psql
-       ;;
-     no)
-       AC_MSG_RESULT([])
-       AC_MSG_ERROR([need pgsql client to run the tests])
-       ;;
-     *)
-       pgsql_client=$withval
-       ;;
-   esac],
-  [pgsql_client=psql])
-
-$pgsql_client --version 2>/dev/null 1>&2
-
-if test x"$?" = x0; then
-  AC_MSG_RESULT([$pgsql_client])
-else
-  AC_MSG_RESULT([no])
-  AC_MSG_ERROR([pgsql client is not found; consider using --with-pgsql-client=PATH])
-fi
-
-# User.
-#
-AC_MSG_CHECKING([for pgsql database user])
-AC_ARG_WITH(
-  [pgsql-user],
-  [AC_HELP_STRING([--with-pgsql-user=NAME], [PostgreSQL database user (odb_test by default). The user must be able to login without specifying a password.])],
-  [case $withval in
-     yes)
-       pgsql_user=odb_test
-       pgsql_user_set=yes
-       ;;
-     no)
-       pgsql_user_set=no
-       ;;
-     *)
-       pgsql_user=$withval
-       pgsql_user_set=yes
-       ;;
-   esac],
-  [pgsql_user=odb_test
-   pgsql_user_set=yes])
-
-if test x$pgsql_user_set = xyes; then
-  AC_MSG_RESULT(['$pgsql_user'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Database name.
-#
-AC_MSG_CHECKING([for pgsql database name])
-AC_ARG_WITH(
-  [pgsql-db],
-  [AC_HELP_STRING([--with-pgsql-db=NAME], [PostgreSQL database name (odb_test by default). Note that all data in this database WILL BE LOST!])],
-  [case $withval in
-     yes)
-       pgsql_db=odb_test
-       pgsql_db_set=yes
-       ;;
-     no)
-       pgsql_db_set=no
-       ;;
-     *)
-       pgsql_db=$withval
-       pgsql_db_set=yes
-       ;;
-   esac],
-  [pgsql_db=odb_test
-   pgsql_db_set=yes])
-
-if test x$pgsql_db_set = xyes; then
-  AC_MSG_RESULT(['$pgsql_db'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Host.
-#
-AC_MSG_CHECKING([for pgsql database host])
-AC_ARG_WITH(
-  [pgsql-host],
-  [AC_HELP_STRING([--with-pgsql-host=HOST], [PostgreSQL database host (local host by default)])],
-  [case $withval in
-     yes)
-       pgsql_host=
-       pgsql_host_set=yes
-       ;;
-     no)
-       pgsql_host_set=no
-       ;;
-     *)
-       pgsql_host=$withval
-       pgsql_host_set=yes
-       ;;
-   esac],
-  [pgsql_host_set=no])
-
-if test x$pgsql_host_set = xyes; then
-  AC_MSG_RESULT(['$pgsql_host'])
-else
-  AC_MSG_RESULT([localhost])
-fi
-
-# Port.
-#
-AC_MSG_CHECKING([for pgsql database port])
-AC_ARG_WITH(
-  [pgsql-port],
-  [AC_HELP_STRING([--with-pgsql-port=PORT], [PostgreSQL database port (standard PostgreSQL port by default)])],
-  [case $withval in
-     yes)
-       pgsql_port=0
-       pgsql_port_set=yes
-       ;;
-     no)
-       pgsql_port_set=no
-       ;;
-     *)
-       pgsql_port=$withval
-       pgsql_port_set=yes
-       ;;
-   esac],
-  [pgsql_port_set=no])
-
-if test x$pgsql_port_set = xyes; then
-  AC_MSG_RESULT(['$pgsql_port'])
-else
-  AC_MSG_RESULT([default])
-fi
-
-# Create options file.
-#
-AC_CONFIG_COMMANDS([pgsql.options],
- [
-   rm -f pgsql.options
-   echo '#! /bin/sh' >pgsql-driver
-
-   echo 'opt=' >>pgsql-driver
-
-   if test x$pgsql_user_set = xyes; then
-     echo "--username '$pgsql_user'" >>pgsql.options
-     echo 'opt="$opt --username='"$pgsql_user"'"' >>pgsql-driver
-   fi
-
-   if test x$pgsql_db_set = xyes; then
-     echo "--dbname '$pgsql_db'" >>pgsql.options
-     echo 'opt="$opt --dbname='"$pgsql_db"'"' >>pgsql-driver
-   fi
-
-   if test x$pgsql_host_set = xyes; then
-     echo "--host '$pgsql_host'" >>pgsql.options
-     echo 'opt="$opt --host='"$pgsql_host"'"' >>pgsql-driver
-   fi
-
-   if test x$pgsql_port_set = xyes; then
-     echo "--port '$pgsql_port'" >>pgsql.options
-     echo 'opt="$opt --port='"$pgsql_port"'"' >>pgsql-driver
-   fi
-
-   echo 'opt="$opt --quiet"' >>pgsql-driver
-   echo 'PGOPTIONS=--client-min-messages=warning' >>pgsql-driver
-   echo 'export PGOPTIONS' >>pgsql-driver
-
-   echo 'if test x$[]1 != x; then' >>pgsql-driver
-   echo "  exec $pgsql_client "'$opt --set ON_ERROR_STOP=1 -f $[]1' >>pgsql-driver
-   echo "else" >>pgsql-driver
-   echo "  exec $pgsql_client "'$opt' >>pgsql-driver
-   echo "fi" >>pgsql-driver
-
-   chmod +x pgsql-driver
- ],
- [
-  pgsql_client="$pgsql_client"
-
-  pgsql_user="$pgsql_user"
-  pgsql_user_set="$pgsql_user_set"
-
-  pgsql_db="$pgsql_db"
-  pgsql_db_set="$pgsql_db_set"
-
-  pgsql_host="$pgsql_host"
-  pgsql_host_set="$pgsql_host_set"
-
-  pgsql_port="$pgsql_port"
-  pgsql_port_set="$pgsql_port_set"
- ])
-
-])dnl
diff --git a/m4/sqlite.m4 b/m4/sqlite.m4
deleted file mode 100644
index 7c1a53e..0000000
--- a/m4/sqlite.m4
+++ /dev/null
@@ -1,59 +0,0 @@
-dnl file      : m4/sqlite.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl SQLITE
-dnl
-AC_DEFUN([SQLITE], [
-
-# Database file.
-#
-AC_MSG_CHECKING([for sqlite database file])
-AC_ARG_WITH(
-  [sqlite-db],
-  [AC_HELP_STRING([--with-sqlite-db=FILE], [SQLite database file (odb-test.db by default). Note that all data in this database WILL BE LOST!])],
-  [case $withval in
-     yes)
-       sqlite_db=odb-test.db
-       sqlite_db_set=yes
-       ;;
-     no)
-       sqlite_db_set=no
-       ;;
-     *)
-       sqlite_db=$withval
-       sqlite_db_set=yes
-       ;;
-   esac],
-  [sqlite_db=odb-test.db
-   sqlite_db_set=yes])
-
-if test x$sqlite_db_set = xyes; then
-
-  # Make it an absolute path unless it is one of the special values.
-  #
-  if test x$sqlite_db != x -a x$sqlite_db != x:memory:; then
-    AS_SET_CATFILE([abs_sqlite_db], [$ac_pwd], [$sqlite_db])
-    sqlite_db=$abs_sqlite_db
-  fi
-
-  AC_MSG_RESULT(['$sqlite_db'])
-else
-  AC_MSG_RESULT([none])
-fi
-
-# Create options file.
-#
-AC_CONFIG_COMMANDS([sqlite.options],
- [
-   rm -f sqlite.options
-
-   if test x$sqlite_db_set = xyes; then
-     echo "--database '$sqlite_db'" >>sqlite.options
-   fi
- ],
- [
-  sqlite_db="$sqlite_db"
-  sqlite_db_set="$sqlite_db_set"
- ])
-
-])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/m4/tr1-memory.m4 b/m4/tr1-memory.m4
deleted file mode 100644
index a70f397..0000000
--- a/m4/tr1-memory.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl file      : m4/tr1-memory.m4
-dnl license   : GNU GPL v2; see accompanying LICENSE file
-dnl
-dnl TR1_MEMORY
-dnl
-dnl Check for TR1 <memory> availability. If successful, define HAVE_TR1_MEMORY
-dnl as both a macro and conditional as well as set the tr1_memory variable
-dnl to 'yes'.
-dnl
-AC_DEFUN([TR1_MEMORY],
-[
-tr1_memory=no
-
-AC_MSG_CHECKING([for TR1 <memory>])
-
-CXX_LIBTOOL_LINK_IFELSE([
-AC_LANG_SOURCE([
-#include <odb/tr1/memory.hxx>
-
-int
-main ()
-{
-  std::tr1::shared_ptr<int> p (new int (10));
-  *p = 11;
-}
-])],
-[tr1_memory=yes])
-
-if test x"$tr1_memory" = xyes; then
-  AC_MSG_RESULT([yes])
-  AC_DEFINE([HAVE_TR1_MEMORY], [1], [Have TR1 <memory>.])
-else
-  AC_MSG_RESULT([no])
-fi
-
-AM_CONDITIONAL([HAVE_TR1_MEMORY], [test x$tr1_memory = xyes])
-
-])dnl