58 files changed, 12 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef479095f..c7f04c6f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,15 @@ option(BOOST_IGNORE_SYSTEM_PATHS "Ignore boost system paths for local boost inst
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 enable_testing()
 
+# Check whether we're on a 32-bit or 64-bit system
+if(CMAKE_SIZEOF_VOID_P EQUAL "8")
+  message(STATUS "Building on a 64-bit system")
+  set(ARCH_WIDTH "64")
+else()
+  message(STATUS "Building on a 32-bit system")
+  set(ARCH_WIDTH "32")
+endif()
+
 # Check if we're on FreeBSD so we can exclude the local miniupnpc (it should be installed from ports instead)
 # CMAKE_SYSTEM_NAME checks are commonly known, but specifically taken from libsdl's CMakeLists
 if(CMAKE_SYSTEM_NAME MATCHES "kFreeBSD.*")
diff --git a/db_drivers/CMakeLists.txt b/db_drivers/CMakeLists.txt
index db386c11f..c96f623d1 100644
--- a/db_drivers/CMakeLists.txt
+++ b/db_drivers/CMakeLists.txt
@@ -28,14 +28,8 @@
 
 # We aren't even going to check the system for an installed LMDB driver, as it is too
 # critical a consensus component to rely on dynamically linked libraries
-if(CMAKE_SIZEOF_VOID_P EQUAL "8")
-  message(STATUS "Using 64-bit LMDB from source tree")
-  add_subdirectory(liblmdb)
-  set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb" PARENT_SCOPE)
-else()
-  message(STATUS "Using 32-bit LMDB from source tree")
-  add_subdirectory(liblmdb-vl32)
-  set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb-vl32" PARENT_SCOPE)
-endif()
+message(STATUS "Using ${ARCH_WIDTH}-bit LMDB from source tree")
+add_subdirectory(liblmdb${ARCH_WIDTH})
+set(LMDB_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/liblmdb${ARCH_WIDTH}" PARENT_SCOPE)
 
 set(LMDB_LIBRARY "lmdb" PARENT_SCOPE)
diff --git a/db_drivers/liblmdb-vl32/.gitignore b/db_drivers/liblmdb32/.gitignore
index f3277afe4..f3277afe4 100644
--- a/db_drivers/liblmdb-vl32/.gitignore
+++ b/db_drivers/liblmdb32/.gitignore
diff --git a/db_drivers/liblmdb-vl32/CHANGES b/db_drivers/liblmdb32/CHANGES
index 34049ba7a..34049ba7a 100644
--- a/db_drivers/liblmdb-vl32/CHANGES
+++ b/db_drivers/liblmdb32/CHANGES
diff --git a/db_drivers/liblmdb-vl32/CMakeLists.txt b/db_drivers/liblmdb32/CMakeLists.txt
index 62b800135..62b800135 100644
--- a/db_drivers/liblmdb-vl32/CMakeLists.txt
+++ b/db_drivers/liblmdb32/CMakeLists.txt
diff --git a/db_drivers/liblmdb-vl32/COPYRIGHT b/db_drivers/liblmdb32/COPYRIGHT
index e0eb484c7..e0eb484c7 100644
--- a/db_drivers/liblmdb-vl32/COPYRIGHT
+++ b/db_drivers/liblmdb32/COPYRIGHT
diff --git a/db_drivers/liblmdb-vl32/Doxyfile b/db_drivers/liblmdb32/Doxyfile
index 92d17b09e..92d17b09e 100644
--- a/db_drivers/liblmdb-vl32/Doxyfile
+++ b/db_drivers/liblmdb32/Doxyfile
diff --git a/db_drivers/liblmdb-vl32/LICENSE b/db_drivers/liblmdb32/LICENSE
index 05ad7571e..05ad7571e 100644
--- a/db_drivers/liblmdb-vl32/LICENSE
+++ b/db_drivers/liblmdb32/LICENSE
diff --git a/db_drivers/liblmdb-vl32/Makefile b/db_drivers/liblmdb32/Makefile
index 095e65587..095e65587 100644
--- a/db_drivers/liblmdb-vl32/Makefile
+++ b/db_drivers/liblmdb32/Makefile
diff --git a/db_drivers/liblmdb-vl32/lmdb.h b/db_drivers/liblmdb32/lmdb.h
index bdbb0b909..bdbb0b909 100644
--- a/db_drivers/liblmdb-vl32/lmdb.h
+++ b/db_drivers/liblmdb32/lmdb.h
diff --git a/db_drivers/liblmdb-vl32/mdb.c b/db_drivers/liblmdb32/mdb.c
index 63fece3d7..63fece3d7 100644
--- a/db_drivers/liblmdb-vl32/mdb.c
+++ b/db_drivers/liblmdb32/mdb.c
diff --git a/db_drivers/liblmdb-vl32/mdb_copy.1 b/db_drivers/liblmdb32/mdb_copy.1
index 094b26056..094b26056 100644
--- a/db_drivers/liblmdb-vl32/mdb_copy.1
+++ b/db_drivers/liblmdb32/mdb_copy.1
diff --git a/db_drivers/liblmdb-vl32/mdb_copy.c b/db_drivers/liblmdb32/mdb_copy.c
index e7f965c03..e7f965c03 100644
--- a/db_drivers/liblmdb-vl32/mdb_copy.c
+++ b/db_drivers/liblmdb32/mdb_copy.c
diff --git a/db_drivers/liblmdb-vl32/mdb_dump.1 b/db_drivers/liblmdb32/mdb_dump.1
index 6fcc93081..6fcc93081 100644
--- a/db_drivers/liblmdb-vl32/mdb_dump.1
+++ b/db_drivers/liblmdb32/mdb_dump.1
diff --git a/db_drivers/liblmdb-vl32/mdb_dump.c b/db_drivers/liblmdb32/mdb_dump.c
index 0eb85fd20..0eb85fd20 100644
--- a/db_drivers/liblmdb-vl32/mdb_dump.c
+++ b/db_drivers/liblmdb32/mdb_dump.c
diff --git a/db_drivers/liblmdb-vl32/mdb_load.1 b/db_drivers/liblmdb32/mdb_load.1
index 728024010..728024010 100644
--- a/db_drivers/liblmdb-vl32/mdb_load.1
+++ b/db_drivers/liblmdb32/mdb_load.1
diff --git a/db_drivers/liblmdb-vl32/mdb_load.c b/db_drivers/liblmdb32/mdb_load.c
index e0d95e13c..e0d95e13c 100644
--- a/db_drivers/liblmdb-vl32/mdb_load.c
+++ b/db_drivers/liblmdb32/mdb_load.c
diff --git a/db_drivers/liblmdb-vl32/mdb_stat.1 b/db_drivers/liblmdb32/mdb_stat.1
index 3d8d461d9..3d8d461d9 100644
--- a/db_drivers/liblmdb-vl32/mdb_stat.1
+++ b/db_drivers/liblmdb32/mdb_stat.1
diff --git a/db_drivers/liblmdb-vl32/mdb_stat.c b/db_drivers/liblmdb32/mdb_stat.c
index 1e9229296..1e9229296 100644
--- a/db_drivers/liblmdb-vl32/mdb_stat.c
+++ b/db_drivers/liblmdb32/mdb_stat.c
diff --git a/db_drivers/liblmdb-vl32/midl.c b/db_drivers/liblmdb32/midl.c
index 88a3aff10..88a3aff10 100644
--- a/db_drivers/liblmdb-vl32/midl.c
+++ b/db_drivers/liblmdb32/midl.c
diff --git a/db_drivers/liblmdb-vl32/midl.h b/db_drivers/liblmdb32/midl.h
index f23d7d3f3..f23d7d3f3 100644
--- a/db_drivers/liblmdb-vl32/midl.h
+++ b/db_drivers/liblmdb32/midl.h
diff --git a/db_drivers/liblmdb-vl32/mtest.c b/db_drivers/liblmdb32/mtest.c
index 2d4e5e832..2d4e5e832 100644
--- a/db_drivers/liblmdb-vl32/mtest.c
+++ b/db_drivers/liblmdb32/mtest.c
diff --git a/db_drivers/liblmdb-vl32/mtest2.c b/db_drivers/liblmdb32/mtest2.c
index f1a3dbd6c..f1a3dbd6c 100644
--- a/db_drivers/liblmdb-vl32/mtest2.c
+++ b/db_drivers/liblmdb32/mtest2.c
diff --git a/db_drivers/liblmdb-vl32/mtest3.c b/db_drivers/liblmdb32/mtest3.c
index f705c52de..f705c52de 100644
--- a/db_drivers/liblmdb-vl32/mtest3.c
+++ b/db_drivers/liblmdb32/mtest3.c
diff --git a/db_drivers/liblmdb-vl32/mtest4.c b/db_drivers/liblmdb32/mtest4.c
index da5a95304..da5a95304 100644
--- a/db_drivers/liblmdb-vl32/mtest4.c
+++ b/db_drivers/liblmdb32/mtest4.c
diff --git a/db_drivers/liblmdb-vl32/mtest5.c b/db_drivers/liblmdb32/mtest5.c
index 39a8c728a..39a8c728a 100644
--- a/db_drivers/liblmdb-vl32/mtest5.c
+++ b/db_drivers/liblmdb32/mtest5.c
diff --git a/db_drivers/liblmdb-vl32/mtest6.c b/db_drivers/liblmdb32/mtest6.c
index 07d575893..07d575893 100644
--- a/db_drivers/liblmdb-vl32/mtest6.c
+++ b/db_drivers/liblmdb32/mtest6.c
diff --git a/db_drivers/liblmdb-vl32/sample-bdb.txt b/db_drivers/liblmdb32/sample-bdb.txt
index 6a959bd68..6a959bd68 100644
--- a/db_drivers/liblmdb-vl32/sample-bdb.txt
+++ b/db_drivers/liblmdb32/sample-bdb.txt
diff --git a/db_drivers/liblmdb-vl32/sample-mdb.txt b/db_drivers/liblmdb32/sample-mdb.txt
index a233ec5dd..a233ec5dd 100644
--- a/db_drivers/liblmdb-vl32/sample-mdb.txt
+++ b/db_drivers/liblmdb32/sample-mdb.txt
diff --git a/db_drivers/liblmdb-vl32/tooltag b/db_drivers/liblmdb32/tooltag
index 229bf16ba..229bf16ba 100644
--- a/db_drivers/liblmdb-vl32/tooltag
+++ b/db_drivers/liblmdb32/tooltag
diff --git a/db_drivers/liblmdb/.gitignore b/db_drivers/liblmdb64/.gitignore
index d5102a87c..d5102a87c 100644
--- a/db_drivers/liblmdb/.gitignore
+++ b/db_drivers/liblmdb64/.gitignore
diff --git a/db_drivers/liblmdb/CHANGES b/db_drivers/liblmdb64/CHANGES
index 34049ba7a..34049ba7a 100644
--- a/db_drivers/liblmdb/CHANGES
+++ b/db_drivers/liblmdb64/CHANGES
diff --git a/db_drivers/liblmdb/CMakeLists.txt b/db_drivers/liblmdb64/CMakeLists.txt
index 62b800135..62b800135 100644
--- a/db_drivers/liblmdb/CMakeLists.txt
+++ b/db_drivers/liblmdb64/CMakeLists.txt
diff --git a/db_drivers/liblmdb/COPYRIGHT b/db_drivers/liblmdb64/COPYRIGHT
index e0eb484c7..e0eb484c7 100644
--- a/db_drivers/liblmdb/COPYRIGHT
+++ b/db_drivers/liblmdb64/COPYRIGHT
diff --git a/db_drivers/liblmdb/Doxyfile b/db_drivers/liblmdb64/Doxyfile
index 92d17b09e..92d17b09e 100644
--- a/db_drivers/liblmdb/Doxyfile
+++ b/db_drivers/liblmdb64/Doxyfile
diff --git a/db_drivers/liblmdb/LICENSE b/db_drivers/liblmdb64/LICENSE
index 05ad7571e..05ad7571e 100644
--- a/db_drivers/liblmdb/LICENSE
+++ b/db_drivers/liblmdb64/LICENSE
diff --git a/db_drivers/liblmdb/Makefile b/db_drivers/liblmdb64/Makefile
index 2d0983eff..2d0983eff 100644
--- a/db_drivers/liblmdb/Makefile
+++ b/db_drivers/liblmdb64/Makefile
diff --git a/db_drivers/liblmdb/lmdb.h b/db_drivers/liblmdb64/lmdb.h
index ebfbc5dc8..ebfbc5dc8 100644
--- a/db_drivers/liblmdb/lmdb.h
+++ b/db_drivers/liblmdb64/lmdb.h
diff --git a/db_drivers/liblmdb/mdb.c b/db_drivers/liblmdb64/mdb.c
index c4dc26903..c4dc26903 100644
--- a/db_drivers/liblmdb/mdb.c
+++ b/db_drivers/liblmdb64/mdb.c
diff --git a/db_drivers/liblmdb/mdb_copy.1 b/db_drivers/liblmdb64/mdb_copy.1
index 094b26056..094b26056 100644
--- a/db_drivers/liblmdb/mdb_copy.1
+++ b/db_drivers/liblmdb64/mdb_copy.1
diff --git a/db_drivers/liblmdb/mdb_copy.c b/db_drivers/liblmdb64/mdb_copy.c
index af0a94111..af0a94111 100644
--- a/db_drivers/liblmdb/mdb_copy.c
+++ b/db_drivers/liblmdb64/mdb_copy.c
diff --git a/db_drivers/liblmdb/mdb_dump.1 b/db_drivers/liblmdb64/mdb_dump.1
index 6fcc93081..6fcc93081 100644
--- a/db_drivers/liblmdb/mdb_dump.1
+++ b/db_drivers/liblmdb64/mdb_dump.1
diff --git a/db_drivers/liblmdb/mdb_dump.c b/db_drivers/liblmdb64/mdb_dump.c
index 0eb85fd20..0eb85fd20 100644
--- a/db_drivers/liblmdb/mdb_dump.c
+++ b/db_drivers/liblmdb64/mdb_dump.c
diff --git a/db_drivers/liblmdb/mdb_load.1 b/db_drivers/liblmdb64/mdb_load.1
index 728024010..728024010 100644
--- a/db_drivers/liblmdb/mdb_load.1
+++ b/db_drivers/liblmdb64/mdb_load.1
diff --git a/db_drivers/liblmdb/mdb_load.c b/db_drivers/liblmdb64/mdb_load.c
index e0d95e13c..e0d95e13c 100644
--- a/db_drivers/liblmdb/mdb_load.c
+++ b/db_drivers/liblmdb64/mdb_load.c
diff --git a/db_drivers/liblmdb/mdb_stat.1 b/db_drivers/liblmdb64/mdb_stat.1
index 3d8d461d9..3d8d461d9 100644
--- a/db_drivers/liblmdb/mdb_stat.1
+++ b/db_drivers/liblmdb64/mdb_stat.1
diff --git a/db_drivers/liblmdb/mdb_stat.c b/db_drivers/liblmdb64/mdb_stat.c
index 1e9229296..1e9229296 100644
--- a/db_drivers/liblmdb/mdb_stat.c
+++ b/db_drivers/liblmdb64/mdb_stat.c
diff --git a/db_drivers/liblmdb/midl.c b/db_drivers/liblmdb64/midl.c
index 88a3aff10..88a3aff10 100644
--- a/db_drivers/liblmdb/midl.c
+++ b/db_drivers/liblmdb64/midl.c
diff --git a/db_drivers/liblmdb/midl.h b/db_drivers/liblmdb64/midl.h
index a7f25026c..a7f25026c 100644
--- a/db_drivers/liblmdb/midl.h
+++ b/db_drivers/liblmdb64/midl.h
diff --git a/db_drivers/liblmdb/mtest.c b/db_drivers/liblmdb64/mtest.c
index 79b4175e7..79b4175e7 100644
--- a/db_drivers/liblmdb/mtest.c
+++ b/db_drivers/liblmdb64/mtest.c
diff --git a/db_drivers/liblmdb/mtest2.c b/db_drivers/liblmdb64/mtest2.c
index f1a3dbd6c..f1a3dbd6c 100644
--- a/db_drivers/liblmdb/mtest2.c
+++ b/db_drivers/liblmdb64/mtest2.c
diff --git a/db_drivers/liblmdb/mtest3.c b/db_drivers/liblmdb64/mtest3.c
index f705c52de..f705c52de 100644
--- a/db_drivers/liblmdb/mtest3.c
+++ b/db_drivers/liblmdb64/mtest3.c
diff --git a/db_drivers/liblmdb/mtest4.c b/db_drivers/liblmdb64/mtest4.c
index da5a95304..da5a95304 100644
--- a/db_drivers/liblmdb/mtest4.c
+++ b/db_drivers/liblmdb64/mtest4.c
diff --git a/db_drivers/liblmdb/mtest5.c b/db_drivers/liblmdb64/mtest5.c
index 39a8c728a..39a8c728a 100644
--- a/db_drivers/liblmdb/mtest5.c
+++ b/db_drivers/liblmdb64/mtest5.c
diff --git a/db_drivers/liblmdb/mtest6.c b/db_drivers/liblmdb64/mtest6.c
index 07d575893..07d575893 100644
--- a/db_drivers/liblmdb/mtest6.c
+++ b/db_drivers/liblmdb64/mtest6.c
diff --git a/db_drivers/liblmdb/sample-bdb.txt b/db_drivers/liblmdb64/sample-bdb.txt
index 6a959bd68..6a959bd68 100644
--- a/db_drivers/liblmdb/sample-bdb.txt
+++ b/db_drivers/liblmdb64/sample-bdb.txt
diff --git a/db_drivers/liblmdb/sample-mdb.txt b/db_drivers/liblmdb64/sample-mdb.txt
index a233ec5dd..a233ec5dd 100644
--- a/db_drivers/liblmdb/sample-mdb.txt
+++ b/db_drivers/liblmdb64/sample-mdb.txt
diff --git a/db_drivers/liblmdb/tooltag b/db_drivers/liblmdb64/tooltag
index 229bf16ba..229bf16ba 100644
--- a/db_drivers/liblmdb/tooltag
+++ b/db_drivers/liblmdb64/tooltag