Get rid of dual config support and _BUILD2 macro in runtime librariesmulti-package-version

9 files changed, 4 insertions, 122 deletions

diff --git a/libodb-boost/odb/boost/buildfile b/libodb-boost/odb/boost/buildfile
index ddd38ec..b8dd6d1 100644
--- a/libodb-boost/odb/boost/buildfile
+++ b/libodb-boost/odb/boost/buildfile
@@ -21,7 +21,6 @@
     imp_libs =
 
     lib{odb-boost}: {hxx ixx txx cxx}{** -version} hxx{version} \
-                    details/build2/{h}{*}                       \
                     options{**} ../options{boost}               \
                     $imp_libs $int_libs
 
@@ -47,7 +46,7 @@
 
     # Build options.
     #
-    cxx.poptions =+ "-I$out_root" "-I$src_root" -DLIBODB_BOOST_BUILD2
+    cxx.poptions =+ "-I$out_root" "-I$src_root"
 
     obja{*}: cxx.poptions += -DLIBODB_BOOST_STATIC_BUILD
     objs{*}: cxx.poptions += -DLIBODB_BOOST_SHARED_BUILD
@@ -56,31 +55,11 @@
     #
     lib{odb-boost}:
     {
-      cxx.export.poptions = "-I$out_root" "-I$src_root" -DLIBODB_BOOST_BUILD2
+      cxx.export.poptions = "-I$out_root" "-I$src_root"
       cxx.export.libs = $int_libs
     }
 
     liba{odb-boost}: cxx.export.poptions += -DLIBODB_BOOST_STATIC
     libs{odb-boost}: cxx.export.poptions += -DLIBODB_BOOST_SHARED
-
-    # Installation tweaks.
-    #
-    install_include = [dir_path] include/odb/boost/
-
-    details/build2/
-    {
-      h{*}: install = false
-
-      if ($cxx.target.system == 'win32-msvc')
-      {
-        h{config-vc}@./:      install = $install_include/details/
-        h{config-vc-stub}@./: install = $install_include/details/build2/config-vc.h
-      }
-      else
-      {
-        h{config}@./:      install = $install_include/details/
-        h{config-stub}@./: install = $install_include/details/build2/config.h
-      }
-    }
   }
 }
diff --git a/libodb-boost/odb/boost/details/build2/config-stub.h b/libodb-boost/odb/boost/details/build2/config-stub.h
deleted file mode 100644
index 6f5f461..0000000
--- a/libodb-boost/odb/boost/details/build2/config-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/boost/details/build2/config-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/boost/details/config.h>
diff --git a/libodb-boost/odb/boost/details/build2/config-vc-stub.h b/libodb-boost/odb/boost/details/build2/config-vc-stub.h
deleted file mode 100644
index c6650f3..0000000
--- a/libodb-boost/odb/boost/details/build2/config-vc-stub.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/boost/details/build2/config-vc-stub.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-#include <odb/boost/details/config-vc.h>
diff --git a/libodb-boost/odb/boost/details/build2/config-vc.h b/libodb-boost/odb/boost/details/build2/config-vc.h
deleted file mode 100644
index 5cdff2b..0000000
--- a/libodb-boost/odb/boost/details/build2/config-vc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* file      : odb/boost/details/build2/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Configuration file for Windows/VC++ for the build2 build. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_VC_H
-#define ODB_BOOST_DETAILS_CONFIG_VC_H
-
-/* Define LIBODB_BOOST_BUILD2 for the installed case. */
-#ifndef LIBODB_BOOST_BUILD2
-#  define LIBODB_BOOST_BUILD2
-#endif
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_VC_H */
diff --git a/libodb-boost/odb/boost/details/build2/config.h b/libodb-boost/odb/boost/details/build2/config.h
deleted file mode 100644
index ea24ba3..0000000
--- a/libodb-boost/odb/boost/details/build2/config.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* file      : odb/boost/details/build2/config.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Static configuration file for the build2 build. The installed case
-   (when LIBODB_BOOST_BUILD2 is not necessarily defined) is the only
-   reason we have it. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_H
-#define ODB_BOOST_DETAILS_CONFIG_H
-
-/* Define LIBODB_BOOST_BUILD2 for the installed case. */
-#ifndef LIBODB_BOOST_BUILD2
-#  define LIBODB_BOOST_BUILD2
-#endif
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_H */
diff --git a/libodb-boost/odb/boost/details/config-vc.h b/libodb-boost/odb/boost/details/config-vc.h
deleted file mode 100644
index 687a1e1..0000000
--- a/libodb-boost/odb/boost/details/config-vc.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* file      : odb/boost/details/config-vc.h
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* Dummy configuration file for Windows/VC++. */
diff --git a/libodb-boost/odb/boost/details/config.h.in b/libodb-boost/odb/boost/details/config.h.in
deleted file mode 100644
index 3cfc3aa..0000000
--- a/libodb-boost/odb/boost/details/config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
-/* file      : odb/boost/details/config.h.in
- * license   : GNU GPL v2; see accompanying LICENSE file
- */
-
-/* This file is automatically processed by configure. */
-
-#ifndef ODB_BOOST_DETAILS_CONFIG_H
-#define ODB_BOOST_DETAILS_CONFIG_H
-
-#undef LIBODB_BOOST_STATIC_LIB
-
-#endif /* ODB_BOOST_DETAILS_CONFIG_H */
diff --git a/libodb-boost/odb/boost/details/config.hxx b/libodb-boost/odb/boost/details/config.hxx
index f0fe850..d5ddef8 100644
--- a/libodb-boost/odb/boost/details/config.hxx
+++ b/libodb-boost/odb/boost/details/config.hxx
@@ -7,13 +7,7 @@
 // no pre
 
 #ifdef ODB_COMPILER
-#  define LIBODB_BOOST_STATIC_LIB
-#elif !defined(LIBODB_BOOST_BUILD2)
-#  ifdef _MSC_VER
-#    include <odb/boost/details/config-vc.h>
-#  else
-#    include <odb/boost/details/config.h>
-#  endif
+#  define LIBODB_BOOST_STATIC
 #endif
 
 // no post
diff --git a/libodb-boost/odb/boost/details/export.hxx b/libodb-boost/odb/boost/details/export.hxx
index cb3b219..fa4e53c 100644
--- a/libodb-boost/odb/boost/details/export.hxx
+++ b/libodb-boost/odb/boost/details/export.hxx
@@ -6,7 +6,7 @@
 
 #include <odb/pre.hxx>
 
-#include <odb/boost/details/config.hxx>
+#include <odb/boost/details/config.hxx> // LIBODB_BOOST_STATIC if ODB_COMPILER
 
 // Normally we don't export class templates (but do complete specializations),
 // inline functions, and classes with only inline member functions. Exporting
@@ -16,8 +16,6 @@
 // used before their inline definition. The workaround is to reorder code. In
 // the end it's all trial and error.
 
-#ifdef LIBODB_BOOST_BUILD2
-
 #if defined(LIBODB_BOOST_STATIC)         // Using static.
 #  define LIBODB_BOOST_EXPORT
 #elif defined(LIBODB_BOOST_STATIC_BUILD) // Building static.
@@ -43,36 +41,6 @@
 #  define LIBODB_BOOST_EXPORT            // Using static or shared.
 #endif
 
-#else // LIBODB_BOOST_BUILD2
-
-#ifdef LIBODB_BOOST_STATIC_LIB
-#  define LIBODB_BOOST_EXPORT
-#else
-#  ifdef _WIN32
-#    ifdef _MSC_VER
-#      ifdef LIBODB_BOOST_DYNAMIC_LIB
-#        define LIBODB_BOOST_EXPORT __declspec(dllexport)
-#      else
-#        define LIBODB_BOOST_EXPORT __declspec(dllimport)
-#      endif
-#    else
-#      ifdef LIBODB_BOOST_DYNAMIC_LIB
-#        ifdef DLL_EXPORT
-#          define LIBODB_BOOST_EXPORT __declspec(dllexport)
-#        else
-#          define LIBODB_BOOST_EXPORT
-#        endif
-#      else
-#        define LIBODB_BOOST_EXPORT __declspec(dllimport)
-#      endif
-#    endif
-#  else
-#    define LIBODB_BOOST_EXPORT
-#  endif
-#endif
-
-#endif // LIBODB_BOOST_BUILD2
-
 #include <odb/post.hxx>
 
 #endif // ODB_BOOST_DETAILS_EXPORT_HXX