1 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 79d7a71ec..cc592590d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
+2010-06-09  Werner Koch  <[email protected]>
+
+	* configure.ac (GNUPG_DIRMNGR_LDAP_PGM): Add option
+	--with-dirmngr-ldap-pgm.
+
+	* am/cmacros.am (-DGNUPG_LOCALSTATEDIR): New.
+	(GNUPG_DEFAULT_DIRMNGR_LDAP): New.
+
+2010-06-08  Werner Koch  <[email protected]>
+
+	* configure.ac: Add build support for dirmngr.
+	(try_ldap): Rename to try_ks_ldap.
+	(GNUPG_CHECK_LDAP): Also test if dirmngr is to be build.
+
+	* Makefile.am (SUBDIRS): Add dirmngr.
+
 2010-06-07  Werner Koch  <[email protected]>
 
+	* dirmngr/: New.
+
 	* configure.ac: Add option --enable-gpgtar.
 
 2010-05-31  Werner Koch  <[email protected]>