Update CHANGES to reflect latest fixes

diff --git a/CHANGES b/CHANGES
index 34643def6f85d682306a8ef2aaddcc27ff9e8e96..a48ee377c951ce95deed582a6765587485dffc6b 100644 (file)
--- 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 ea8f12044a20bb42d2628826ac5a37fca3f959fa..0e8826b6062a537aeaab0b0369f886b2ea7f2c6a 100755 (executable)
--- 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 cacc884cabf86f1607361bbadf6a7f13733862e3..21da9952276684ff7d1a9f52a70797627c6a2b7e 100644 (file)
--- 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,