oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Prefer BDB3/4/5 to BDB1/2

Browse Source
This commit is contained in:
Marcin Cieślak
2016-08-12 02:52:48 +00:00
committed by Viktor Dukhovni
parent afead1717c
commit 033001e732
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/hdb/db.c
View File

@@ -33,7 +33,7 @@
#include "hdb_locl.h" #include "hdb_locl.h"
#if HAVE_DB1 #if defined(HAVE_DB1) && !defined(HAVE_DB3)
#if defined(HAVE_DB_185_H) #if defined(HAVE_DB_185_H)
#include <db_185.h> #include <db_185.h>
@@ -376,4 +376,4 @@ hdb_db_create(krb5_context context, HDB **db,
return 0; return 0;
} }
#endif /* HAVE_DB1 */ #endif /* defined(HAVE_DB1) && !defined(HAVE_DB3) */

8
lib/otp/Makefile.am
View File

@@ -19,14 +19,14 @@ lib_LTLIBRARIES = libotp.la
libotp_la_LDFLAGS = -version-info 1:5:1 libotp_la_LDFLAGS = -version-info 1:5:1
libotp_la_LIBADD = $(LIB_hcrypto) $(LIB_roken) 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 if HAVE_DB3
ndbm_wrap = ndbm_wrap.c ndbm_wrap.h ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
libotp_la_LIBADD += $(DB3LIB) libotp_la_LIBADD += $(DB3LIB)
else else
if HAVE_DB1
ndbm_wrap = ndbm_wrap.c ndbm_wrap.h
libotp_la_LIBADD += $(DB1LIB)
else
ndbm_wrap = ndbm_wrap =
libotp_la_LIBADD += $(NDBMLIB) libotp_la_LIBADD += $(NDBMLIB)
endif endif