Release version 2.5.0-b.25+12.5.0-b.25+1

- Fix odb/sqlite/details/config.hxx for build2 build. In particular, this
  makes sure that the unlock notify and column metadata enabled if available
  in SQLite.

3 files changed, 22 insertions, 2 deletions

diff --git a/manifest b/manifest
index 7dce846..f888c23 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
 : 1
 name: libodb-sqlite
-version: 2.5.0-b.25
+version: 2.5.0-b.25+1
 project: odb
 summary: SQLite ODB runtime library
 license: GPL-2.0-only
diff --git a/odb/sqlite/details/config.hxx b/odb/sqlite/details/config.hxx
index bbf32f6..4f1c5ce 100644
--- a/odb/sqlite/details/config.hxx
+++ b/odb/sqlite/details/config.hxx
@@ -16,6 +16,18 @@
 #  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>
+
+#  if SQLITE_VERSION_NUMBER >= 3006012
+#    define LIBODB_SQLITE_HAVE_UNLOCK_NOTIFY 1
+#  endif
+#  define LIBODB_SQLITE_HAVE_COLUMN_METADATA 1
+#endif
+
 // no post
 
 #endif // ODB_SQLITE_DETAILS_CONFIG_HXX
diff --git a/odb/sqlite/details/export.hxx b/odb/sqlite/details/export.hxx
index 515b891..c0903ae 100644
--- a/odb/sqlite/details/export.hxx
+++ b/odb/sqlite/details/export.hxx
@@ -6,7 +6,15 @@
 
 #include <odb/pre.hxx>
 
-#include <odb/sqlite/details/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),
 // inline functions, and classes with only inline member functions. Exporting