ITS#7390

Update configure for MozNSS check

diff --git a/CHANGES b/CHANGES
index 730d8e8b6d3ad649214c7ada189d8d03b37e952f..b4d3be7f5dbae6d9a3ba00139431443fbc4e4072 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.33 Engineering
        Fixed slapd acl handling with zero-length values (ITS#7350)
        Fixed slapd syncprov to not reference ops inside a lock (ITS#7172)
        Fixed slapd delta-syncrepl MMR with large attribute values (ITS#7354)
+       Fixed slapd slapd_rw_destroy function (ITS#7390)
        Fixed slapd-mdb slapadd -q -w double free (ITS#7356)
        Fixed slapd-mdb to close read txn in reindex commit (ITS#7386)
        Fixed slapo-constraint with multiple modifications (ITS#7168)

diff --git a/configure b/configure
index a9c2177b7fa642fe6a1e06543e269a868e054c86..e4c8adc8e8b06ed2175f72e35b0f379b6d236b9f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: 5d7d475f16befcc240afc953c9a8775677566d23 .
+# From configure.in Id: 792cf0cd7da87fae39dca56961bcad11cf8b3d38 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -15764,7 +15764,9 @@ $as_echo "#define HAVE_MOZNSS 1" >>confdefs.h
 
                        TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
                else
+                       if test $ol_with_tls = moznss ; then
                        as_fn_error "MozNSS not found - please specify the location to the NSPR and NSS header files in CPPFLAGS and the location to the NSPR and NSS libraries in LDFLAGS (if not in the system location)" "$LINENO" 5
+                       fi
                fi
        fi
 fi