ITS#7710 fix typo

[openldap] / configure.in

diff --git a/configure.in b/configure.in
index f0f8d996f3de4fb2ff4449711e14444f62107475..366ad9e50f26176e8942b96d68b46859c03d0378 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl $OpenLDAP$
 dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
 dnl
-dnl Copyright 1998-2012 The OpenLDAP Foundation.
+dnl Copyright 1998-2013 The OpenLDAP Foundation.
 dnl All rights reserved.
 dnl
 dnl Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
 define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl
 dnl ================================================================
 dnl Configure.in for OpenLDAP
-AC_COPYRIGHT([[Copyright 1998-2012 The OpenLDAP Foundation. All rights reserved.
+AC_COPYRIGHT([[Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.]])
 AC_REVISION([$Id$])
 AC_INIT([OpenLDAP],,[http://www.openldap.org/its/])
@@ -98,7 +98,7 @@ AH_TOP([
 /* begin of portable.h.pre */
 /* 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
@@ -303,12 +303,12 @@ SLAPD Backend Options:])
 
 OL_ARG_ENABLE(backends,[    --enable-backends    enable all available backends],
        --, [no yes mod])dnl
-OL_ARG_ENABLE(bdb,[    --enable-bdb      enable Berkeley DB backend],
+OL_ARG_ENABLE(deprecated_bdb,[    --enable-deprecated-bdb        enable deprecated Berkeley DB backend. Will be removed in OpenLDAP 2.6],
        no, [no yes mod], ol_enable_backends)dnl
 OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv        enable dnssrv backend],
        no, [no yes mod], ol_enable_backends)dnl
-OL_ARG_ENABLE(hdb,[    --enable-hdb      enable Hierarchical DB backend],
-       yes, [no yes mod], ol_enable_backends)dnl
+OL_ARG_ENABLE(deprecated_hdb,[    --enable-deprecated-hdb        enable deprecated Hierarchical DB backend. Will be removed in OpenLDAP 2.6],
+       no, [no yes mod], ol_enable_backends)dnl
 OL_ARG_ENABLE(ldap,[    --enable-ldap    enable ldap backend],
        no, [no yes mod], ol_enable_backends)dnl
 OL_ARG_ENABLE(mdb,[    --enable-mdb      enable mdb database backend],
@@ -471,9 +471,9 @@ if test $ol_enable_slapd = no ; then
        ol_enable_rewrite=no
 
 elif test $ol_enable_modules != yes &&
-       test $ol_enable_bdb = no &&
+       test $ol_enable_deprecated_bdb = no &&
        test $ol_enable_dnssrv = no &&
-       test $ol_enable_hdb = no &&
+       test $ol_enable_deprecated_hdb = no &&
        test $ol_enable_ldap = no &&
        test $ol_enable_mdb = no &&
        test $ol_enable_meta = no &&
@@ -1242,7 +1242,9 @@ if test $ol_link_tls = no ; then
                                          [define if you have MozNSS])
                        TLS_LIBS="-lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
                else
+                       if test $ol_with_tls = moznss ; then
                        AC_MSG_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)])
+                       fi
                fi
        fi
 fi
@@ -1874,7 +1876,7 @@ fi
 dnl ----------------------------------------------------------------
 ol_link_bdb=no 
 
-if test $ol_enable_bdb/$ol_enable_hdb != no/no; then
+if test $ol_enable_deprecated_bdb/$ol_enable_deprecated_hdb != no/no; then
        OL_BERKELEY_DB
 
        if test $ol_cv_berkeley_db = no ; then
@@ -2616,10 +2618,10 @@ if test "$ol_enable_monitor" != no ; then
        AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend])
 fi
 
-if test "$ol_enable_bdb" != no ; then
+if test "$ol_enable_deprecated_bdb" != no ; then
        BUILD_SLAPD=yes
-       BUILD_BDB=$ol_enable_bdb
-       if test "$ol_enable_bdb" = mod ; then
+       BUILD_BDB=$ol_enable_deprecated_bdb
+       if test "$ol_enable_deprecated_bdb" = mod ; then
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
                MFLAG=SLAPD_MOD_DYNAMIC
        else
@@ -2642,10 +2644,10 @@ if test "$ol_enable_dnssrv" != no ; then
        AC_DEFINE_UNQUOTED(SLAPD_DNSSRV,$MFLAG,[define to support DNS SRV backend])
 fi
 
-if test "$ol_enable_hdb" != no ; then
+if test "$ol_enable_deprecated_hdb" != no ; then
        BUILD_SLAPD=yes
-       BUILD_HDB=$ol_enable_hdb
-       if test "$ol_enable_hdb" = mod ; then
+       BUILD_HDB=$ol_enable_deprecated_hdb
+       if test "$ol_enable_deprecated_hdb" = mod ; then
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"
                MFLAG=SLAPD_MOD_DYNAMIC
        else
@@ -3220,7 +3222,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
@@ -3271,7 +3273,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