From be85d32f0f645e47104ef1241acac1041cc58c16 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 4 Aug 2016 09:04:25 +0200
Subject: Minor config.hxx rearrangement

---
 odb/details/config.hxx | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/odb/details/config.hxx b/odb/details/config.hxx
index b240f5c..36875fa 100644
--- a/odb/details/config.hxx
+++ b/odb/details/config.hxx
@@ -7,15 +7,6 @@
 
 // no pre
 
-#ifdef ODB_COMPILER
-#  define ODB_THREADS_NONE
-#  define LIBODB_STATIC_LIB
-#elif defined(_MSC_VER)
-#  include <odb/details/config-vc.h>
-#else
-#  include <odb/details/config.h>
-#endif
-
 // C++11 support.
 //
 #ifdef _MSC_VER
@@ -66,6 +57,21 @@
 #  define ODB_NOTHROW_NOEXCEPT throw()
 #endif
 
+// Once we drop support for C++98, we can probably get rid of config.h except
+// for the autotools case by fixing ODB_THREADS_CXX11 (and perhaps supporting
+// the ODB_THREADS_NONE case via a "global" (command line) define).
+//
+#ifdef ODB_COMPILER
+#  define ODB_THREADS_NONE
+#  define LIBODB_STATIC_LIB
+#elif defined(LIBODB_BUILD2)
+#  include <odb/details/build2/config.h>
+#elif defined(_MSC_VER)
+#  include <odb/details/config-vc.h>
+#else
+#  include <odb/details/config.h>
+#endif
+
 // no post
 
 #endif // ODB_DETAILS_CONFIG_HXX
-- 
cgit v1.1