Corrected libgdbm issues

diff --git a/acconfig.h b/acconfig.h
index 626985ae31c7b69be3f77d236d83286541f660f7..e9f9db8709d20e1f779624b07ca838a71d2b98f2 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -33,5 +33,6 @@
 #undef ENABLE_ANON
 
 #undef HAVE_LIBOPENCDK
+#undef HAVE_LIBGDBM
 
 #undef C99_MACROS

diff --git a/configure.in b/configure.in
index 86ad703526026c6d1b6cedca39731a2832f94304..3d13a46cfd7398e282717eb4b41c666acf1a1b2a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -252,7 +252,9 @@ AC_ARG_WITH( ext-libraries, [  --without-ext-libraries disable external librarie
 
 if test x$ac_ext_libraries != xno; then
  AC_MSG_RESULT(yes)
- AC_CHECK_LIB(gdbm, gdbm_open, SERV_LIBS="-lgdbm", AC_MSG_WARN(
+ AC_CHECK_LIB(gdbm, gdbm_open, 
+AC_DEFINE(HAVE_LIBGDBM)
+SERV_LIBS="-lgdbm", AC_MSG_WARN(
 *** 
 *** GDBM was not found. This is only needed for the gnutls-serv application.))
  AC_CHECK_LIB(z, compress,,AC_MSG_WARN(

diff --git a/doc/TODO b/doc/TODO
index c993347caf7ae656a8100ae98915461deb2c9834..5fa67a5b94bdc08c5eb58d7f17dd41158da89149 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -8,7 +8,6 @@ Current list:
 * Add PKCS-12 support
 * Convert documentation to texinfo format
 * Merge common stuff in DHE and DHA key exchange
-* Remove the gdbm backend
 - Add Kerberos support
 
 (+) Means high priority 

diff --git a/src/Makefile.am b/src/Makefile.am
index ba32877bfd2b145cd5259424bdd8c4d34904cadc..55462e2950b0114f23f0983822cf5f93ef9e6b52 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I../lib -I../libtasn1/lib
 
 bin_PROGRAMS = gnutls-serv gnutls-cli gnutls-srpcrypt gnutls-cli-debug
 gnutls_serv_SOURCES = serv-gaa.c serv.c common.c
-gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) #$(SERV_LIBS)
+gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS) $(SERV_LIBS)
 gnutls_srpcrypt_SOURCES = crypt-gaa.c crypt.c
 gnutls_srpcrypt_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la  $(LIBGCRYPT_LIBS) $(LIBOPENCDK_LIBS)
 gnutls_cli_SOURCES = cli-gaa.c cli.c common.c