8 files changed, 7 insertions, 114 deletions
diff --git a/libodb-sqlite/odb/sqlite/details/build2/config-stub.h b/libodb-sqlite/odb/sqlite/details/build2/config-stub.h
deleted file mode 100644
index 34ba8ff..0000000
--- a/libodb-sqlite/odb/sqlite/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/sqlite/details/build2/config-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/sqlite/details/config.h>
diff --git a/libodb-sqlite/odb/sqlite/details/build2/config-vc-stub.h b/libodb-sqlite/odb/sqlite/details/build2/config-vc-stub.h
deleted file mode 100644
index 70e3e93..0000000
--- a/libodb-sqlite/odb/sqlite/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/sqlite/details/build2/config-vc-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/sqlite/details/config-vc.h>
diff --git a/libodb-sqlite/odb/sqlite/details/build2/config-vc.h b/libodb-sqlite/odb/sqlite/details/build2/config-vc.h
deleted file mode 100644
index 75ce442..0000000
--- a/libodb-sqlite/odb/sqlite/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file      : odb/sqlite/details/build2/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_SQLITE_DETAILS_CONFIG_VC_H
-#define ODB_SQLITE_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_SQLITE_BUILD2 for the installed case. */
-#ifndef LIBODB_SQLITE_BUILD2
-#  define LIBODB_SQLITE_BUILD2
-#endif
-
-#endif /* ODB_SQLITE_DETAILS_CONFIG_VC_H */
diff --git a/libodb-sqlite/odb/sqlite/details/build2/config.h b/libodb-sqlite/odb/sqlite/details/build2/config.h
deleted file mode 100644
index b4a1a1f..0000000
--- a/libodb-sqlite/odb/sqlite/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file      : odb/sqlite/details/build2/config.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
-   (when LIBODB_SQLITE_BUILD2 is not necessarily defined) is the only
-   reason we have it. */
-
-#ifndef ODB_SQLITE_DETAILS_CONFIG_H
-#define ODB_SQLITE_DETAILS_CONFIG_H
-
-/* Define LIBODB_SQLITE_BUILD2 for the installed case. */
-#ifndef LIBODB_SQLITE_BUILD2
-#  define LIBODB_SQLITE_BUILD2
-#endif
-
-#endif /* ODB_SQLITE_DETAILS_CONFIG_H */
diff --git a/libodb-sqlite/odb/sqlite/details/config-vc.h b/libodb-sqlite/odb/sqlite/details/config-vc.h
deleted file mode 100644
index f42c2a0..0000000
--- a/libodb-sqlite/odb/sqlite/details/config-vc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/sqlite/details/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Dummy configuration file for Windows/VC++. */
diff --git a/libodb-sqlite/odb/sqlite/details/config.h.in b/libodb-sqlite/odb/sqlite/details/config.h.in
deleted file mode 100644
index a223ecb..0000000
--- a/libodb-sqlite/odb/sqlite/details/config.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-/* file      : odb/sqlite/details/config.h.in
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef ODB_SQLITE_DETAILS_CONFIG_H
-#define ODB_SQLITE_DETAILS_CONFIG_H
-
-#undef LIBODB_SQLITE_STATIC_LIB
-#undef LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY
-#undef LIBODB_SQLITE_HAVE_COLUMN_METADATA
-
-#endif /* ODB_SQLITE_DETAILS_CONFIG_H */
diff --git a/libodb-sqlite/odb/sqlite/details/config.hxx b/libodb-sqlite/odb/sqlite/details/config.hxx
index 4f1c5ce..98f4bca 100644
--- a/libodb-sqlite/odb/sqlite/details/config.hxx
+++ b/libodb-sqlite/odb/sqlite/details/config.hxx
@@ -8,26 +8,16 @@
 
 #ifdef ODB_COMPILER
 #  error libodb-sqlite header included in odb-compiled header
-#elif !defined(LIBODB_SQLITE_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/sqlite/details/config-vc.h>
-#  else
-#    include <odb/sqlite/details/config.h>
-#  endif
 #endif
 
-// LIBODB_SQLITE_BUILD2 macro can be defined either by the buildfile or by the
-// included odb/sqlite/details/config*.h (see above).
-//
-#ifdef LIBODB_SQLITE_BUILD2
-#  include <sqlite3.h>
+#include <sqlite3.h>
 
-#  if SQLITE_VERSION_NUMBER >= 3006012
-#    define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1
-#  endif
-#  define LIBODB_SQLITE_HAVE_COLUMN_METADATA 1
+#if SQLITE_VERSION_NUMBER >= 3006012
+#  define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1
 #endif
 
+#define LIBODB_SQLITE_HAVE_COLUMN_METADATA 1
+
 // no post
 
 #endif // ODB_SQLITE_DETAILS_CONFIG_HXX
diff --git a/libodb-sqlite/odb/sqlite/details/export.hxx b/libodb-sqlite/odb/sqlite/details/export.hxx
index c0903ae..639db2a 100644
--- a/libodb-sqlite/odb/sqlite/details/export.hxx
+++ b/libodb-sqlite/odb/sqlite/details/export.hxx
@@ -6,14 +6,10 @@
 
 #include <odb/pre.hxx>
 
+// Note: do this check directly instead of including config.hxx.
+//
 #ifdef ODB_COMPILER
 #  error libodb-sqlite header included in odb-compiled header
-#elif !defined(LIBODB_SQLITE_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/sqlite/details/config-vc.h>
-#  else
-#    include <odb/sqlite/details/config.h>
-#  endif
 #endif
 
 // Normally we don't export class templates (but do complete specializations),
@@ -24,8 +20,6 @@
 // used before their inline definition. The workaround is to reorder code. In
 // the end it's all trial and error.
 
-#ifdef LIBODB_SQLITE_BUILD2
-
 #if defined(LIBODB_SQLITE_STATIC)         // Using static.
 #  define LIBODB_SQLITE_EXPORT
 #elif defined(LIBODB_SQLITE_STATIC_BUILD) // Building static.
@@ -51,36 +45,6 @@
 #  define LIBODB_SQLITE_EXPORT            // Using static or shared.
 #endif
 
-#else // LIBODB_SQLITE_BUILD2
-
-#ifdef LIBODB_SQLITE_STATIC_LIB
-#  define LIBODB_SQLITE_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBODB_SQLITE_DYNAMIC_LIB
-#        define LIBODB_SQLITE_EXPORT __declspec(dllexport)
-#      else
-#        define LIBODB_SQLITE_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBODB_SQLITE_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBODB_SQLITE_EXPORT __declspec(dllexport)
-#        else
-#          define LIBODB_SQLITE_EXPORT
-#        endif
-#      else
-#        define LIBODB_SQLITE_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBODB_SQLITE_EXPORT
-#  endif
-#endif
-
-#endif // LIBODB_SQLITE_BUILD2
-
 #include <odb/post.hxx>
 
 #endif // ODB_SQLITE_DETAILS_EXPORT_HXX