Fix merge conflicts between head and RE25

diff --git a/build/openldap.m4 b/build/openldap.m4
index 4201bf42eb49f9a86dd33d73b4e089da9d825540..32a52c7078168a5962b44c8c29b753fbfc192c0c 100644 (file)
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -548,10 +548,10 @@ AC_DEFUN([OL_BDB_COMPAT],
 #      define DB_VERSION_MINOR 0
 #endif
 #ifndef DB_VERSION_PATCH
-#      define DB_VERSION_PATCH 0
+#      define DB_VERSION_PATCH 0
 #endif
 
-#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
+#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
 /* require 4.4 or later, but less than 6.0.20 */
 #if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014

diff --git a/configure b/configure
index 716d0a8d34973ec0fd845653c685b6f088e951c9..ca07dba8a1ddb26b05231025bf9818939d31d8f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 810b2fa7f4d7cddaa014d0727a62cd13d1b7068f .
+# From configure.in Id: 72cd4c0631fb2e0f29b8d66eb4786d97441f5249 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -20379,10 +20379,10 @@ else
 #      define DB_VERSION_MINOR 0
 #endif
 #ifndef DB_VERSION_PATCH
-#      define DB_VERSION_PATCH 0
+#      define DB_VERSION_PATCH 0
 #endif
 
-#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
+#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
 /* require 4.4 or later, but less than 6.0.20 */
 #if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014