From 9f38f3918af532e1e5a1f139b89b2a1f68dec265 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 3 Feb 2011 22:04:31 +0100 Subject: Fix test for gcry_pk_get_curve. Add a compatibility fixes for the non-curve case. Remove -lber from the dirmngr link line. --- dirmngr/ChangeLog | 4 ++++ dirmngr/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'dirmngr') diff --git a/dirmngr/ChangeLog b/dirmngr/ChangeLog index 02defce7e..3a01b97af 100644 --- a/dirmngr/ChangeLog +++ b/dirmngr/ChangeLog @@ -1,3 +1,7 @@ +2011-02-03 Werner Koch + + * Makefile.am (dirmngr_LDADD): Remove -llber. + 2011-01-25 Werner Koch * dirmngr.c (handle_connections): Rewrite loop to use pth-select diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index 79acae9f7..8c41c53b2 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -62,7 +62,7 @@ endif dirmngr_LDADD = $(libcommonpth) ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(PTH_LIBS) $(LIBINTL) $(LIBICONV) if !USE_LDAPWRAPPER -dirmngr_LDADD += $(LDAPLIBS) -llber #FIXME: Test for liblber first. +dirmngr_LDADD += $(LDAPLIBS) endif dirmngr_LDFLAGS = $(extra_bin_ldflags) -- cgit v1.2.3