Prefer BDB3/4/5 to BDB1/2

heimdal · Nov 8, 2016 · 033001e · 033001e
1 parent afead17
commit 033001e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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