From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 21 Jun 2003 19:18:18 +0000 (+0000)
Subject: Update CHANGES to reflect latest fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_1_22~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15bebc2a9dab08b4c58683e8d493206c1d8f8847;p=openldap

Update CHANGES to reflect latest fixes
---

diff --git a/CHANGES b/CHANGES
index 34643def6f..a48ee377c9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 OpenLDAP 2.1 Change Log
 
+OpenLDAP 2.1.22 Engineering
+	Fixed slapadd dnfree bug (ITS#2587)
+	Fixed slapd yielding select fix (ITS#2603)
+	Build Environment
+		Fixed back-ldap/meta conflict (ITS#2608)
+
 OpenLDAP 2.1.21 Release
 	Fixed liblber ber_get_next trickle bug (ITS#2490)
 	Fixed ldapsearch -p without -h bug (ITS#2532)
diff --git a/configure b/configure
index ea8f12044a..0e8826b606 100755
--- a/configure
+++ b/configure
@@ -23084,7 +23084,6 @@ EOF
 
 	BUILD_SLAPD=yes
 	BUILD_META=yes
-	BUILD_LDAP=yes
 	BUILD_REWRITE=yes
 	if test "$ol_with_meta_module" != static ; then
 		cat >> confdefs.h <<\EOF
diff --git a/configure.in b/configure.in
index cacc884cab..21da995227 100644
--- a/configure.in
+++ b/configure.in
@@ -2584,7 +2584,6 @@ if test "$ol_enable_meta" != no ; then
 	AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])
 	BUILD_SLAPD=yes
 	BUILD_META=yes
-	BUILD_LDAP=yes
 	BUILD_REWRITE=yes
 	if test "$ol_with_meta_module" != static ; then
 		AC_DEFINE(SLAPD_META_DYNAMIC,1,