Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / configure

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