handle softadd/softdel (internal modifications; ITS#7773)

[openldap] / configure

diff --git a/configure b/configure
index a9c2177b7fa642fe6a1e06543e269a868e054c86..37e4702b2c2ecb920f60d4e957a111f22150090c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /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.
 #
-# Copyright 1998-2012 The OpenLDAP Foundation. All rights reserved.
+# Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
 # Restrictions apply, see COPYRIGHT and LICENSE files.
 #
 #
@@ -1819,7 +1819,7 @@ Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 1998-2012 The OpenLDAP Foundation. All rights reserved.
+Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.
 _ACEOF
   exit
@@ -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
@@ -26204,7 +26206,7 @@ rm -f $BACKENDSC
 cat > $BACKENDSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26255,7 +26257,7 @@ rm -f $OVERLAYSC
 cat > $OVERLAYSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without