From 033001e73222f018ff532646fa7c6ff1d6b9baf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Cie=C5=9Blak?= <saper@saper.info>
Date: Fri, 12 Aug 2016 02:52:48 +0000
Subject: [PATCH] Prefer BDB3/4/5 to BDB1/2

---
 lib/hdb/db.c        | 4 ++--
 lib/otp/Makefile.am | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/hdb/db.c b/lib/hdb/db.c
index 904f41f97a..7b9a5ca817 100644
--- a/lib/hdb/db.c
+++ b/lib/hdb/db.c
@@ -33,7 +33,7 @@
 
 #include "hdb_locl.h"
 
-#if HAVE_DB1
+#if defined(HAVE_DB1) && !defined(HAVE_DB3)
 
 #if defined(HAVE_DB_185_H)
 #include <db_185.h>
@@ -376,4 +376,4 @@ hdb_db_create(krb5_context context, HDB **db,
     return 0;
 }
 
-#endif /* HAVE_DB1 */
+#endif /* defined(HAVE_DB1) && !defined(HAVE_DB3) */
diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am
index 371a61ae3f..018e4ef32f 100644
--- a/lib/otp/Makefile.am
+++ b/lib/otp/Makefile.am
@@ -19,14 +19,14 @@ lib_LTLIBRARIES = libotp.la
 libotp_la_LDFLAGS = -version-info 1:5:1
 libotp_la_LIBADD  = $(LIB_hcrypto) $(LIB_roken)
 
-if HAVE_DB1
-ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
-libotp_la_LIBADD += $(DB1LIB)
-else
 if HAVE_DB3
 ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
 libotp_la_LIBADD += $(DB3LIB)
 else
+if HAVE_DB1
+ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
+libotp_la_LIBADD += $(DB1LIB)
+else
 ndbm_wrap =
 libotp_la_LIBADD += $(NDBMLIB)
 endif