Merge remote-tracking branch 'origin/mdb.master'

[openldap] / configure

diff --git a/configure b/configure
index eac8b3d620aeb84b7f7af77ac40b0a23aed5df6e..2e8d741f8e55e2d761666a430c9a7216fa10c9e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: b347fe34b6da10656d58f36e042720ff12a6cfff .
+# From configure.in Id: f0f8d996f3de4fb2ff4449711e14444f62107475 .
 # 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