From 889bcf6fd1fc6b2d5c84c934c173b391b4155a22 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 31 Jan 2011 21:53:50 +0000
Subject: [PATCH] Add moznss support

---
 configure | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index c2b04aa137..b218376a2e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP.
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.631.2.33 2011/01/31 20:51:37 hyc Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -1723,7 +1723,7 @@ Optional Packages:
   --with-cyrus-sasl	  with Cyrus SASL support [auto]
   --with-fetch		  with fetch(3) URL support [auto]
   --with-threads	  with threads [auto]
-  --with-tls		  with TLS/SSL support auto|openssl|gnutls [auto]
+  --with-tls		  with TLS/SSL support auto|openssl|gnutls|moznss [auto]
   --with-yielding-select  with implicitly yielding select [auto]
   --with-mp               with multiple precision statistics auto|longlong|long|bignum|gmp [auto]
   --with-odbc             with specific ODBC support iodbc|unixodbc|odbc32|auto [auto]
@@ -3684,7 +3684,7 @@ fi
 if test "${with_tls+set}" = set; then :
   withval=$with_tls;
 	ol_arg=invalid
-	for ol_val in auto openssl gnutls yes no  ; do
+	for ol_val in auto openssl gnutls moznss yes no  ; do
 		if test "$withval" = "$ol_val" ; then
 			ol_arg="$ol_val"
 		fi
@@ -15663,6 +15663,79 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 	fi
 fi
 
+if test $ol_link_tls = no ; then
+	if test $ol_with_tls = moznss || test $ol_with_tls = auto ; then
+		have_moznss=no
+		for ac_header in nssutil.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "nssutil.h" "ac_cv_header_nssutil_h" "$ac_includes_default"
+if test "x$ac_cv_header_nssutil_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NSSUTIL_H 1
+_ACEOF
+
+fi
+
+done
+
+		if test "$ac_cv_header_nssutil_h" = yes ; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS_Initialize in -lnss3" >&5
+$as_echo_n "checking for NSS_Initialize in -lnss3... " >&6; }
+if test "${ac_cv_lib_nss3_NSS_Initialize+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnss3  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char NSS_Initialize ();
+int
+main ()
+{
+return NSS_Initialize ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_nss3_NSS_Initialize=yes
+else
+  ac_cv_lib_nss3_NSS_Initialize=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_NSS_Initialize" >&5
+$as_echo "$ac_cv_lib_nss3_NSS_Initialize" >&6; }
+if test "x$ac_cv_lib_nss3_NSS_Initialize" = x""yes; then :
+   have_moznss=yes
+else
+   have_moznss=no
+fi
+
+		fi
+
+		if test "$have_moznss" = yes ; then
+			ol_with_tls=moznss
+			ol_link_tls=yes
+
+$as_echo "#define HAVE_MOZNSS 1" >>confdefs.h
+
+			TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
+		else
+			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
+
 WITH_TLS=no
 if test $ol_link_tls = yes ; then
 
-- 
2.39.5