From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 22 Jul 2014 18:58:36 +0000 (-0500)
Subject: ITS#7890
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~109
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f66d2a1c7ef1b4bb4f1da8ab701b322500b8e123;p=openldap

ITS#7890
Drop support for BDB 6.0.20 and later, incompatible license
---

diff --git a/build/openldap.m4 b/build/openldap.m4
index 98b038183d..5d27cc3525 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -547,12 +547,18 @@ AC_DEFUN([OL_BDB_COMPAT],
 #ifndef DB_VERSION_MINOR
 #	define DB_VERSION_MINOR 0
 #endif
+#ifndef DB_VERSION_PATCH
+#      define DB_VERSION_PATCH 0
+#endif
 
-#define DB_VERSION_MM	((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
-/* require 4.4 or later */
-#if DB_VERSION_MM >= 0x0404
+/* require 4.4 or later, but less than 6.0.20 */
+#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
 	__db_version_compat
+#endif
+#if DB_VERSION_FULL >= 0x060014
+#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
 #endif
 	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
 ])