ITS#7177 add SASL_NOCANON option to ldap.conf(5)

[openldap] / configure

diff --git a/configure b/configure
index 4ace07c5fc17789f3b9f12bad039e6777f4e1d83..9981177afc208b9972025a98c1897e468ceaeeaa 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
-# From configure.in Id: dcf25e3f8301a00a1aac9034d2381bdc4d8ee274 .
+# From configure.in Id: 97a7d8d69c5231a056a85cedd1c591b0c2e46daa .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
-# Copyright 1998-2016 The OpenLDAP Foundation. All rights reserved.
+# Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
 # Restrictions apply, see COPYRIGHT and LICENSE files.
 #
 #
@@ -1828,7 +1828,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-2016 The OpenLDAP Foundation. All rights reserved.
+Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.
 _ACEOF
   exit
@@ -15536,9 +15536,9 @@ done
 
 
        if test $ac_cv_header_openssl_ssl_h = yes ; then
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
-if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then :
+               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_msg_callback in -lssl" >&5
+$as_echo_n "checking for SSL_CTX_set_msg_callback in -lssl... " >&6; }
+if test "${ac_cv_lib_ssl_SSL_CTX_set_msg_callback+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15552,27 +15552,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char SSL_CTX_set_msg_callback ();
 int
 main ()
 {
-return SSL_library_init ();
+return SSL_CTX_set_msg_callback ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_ssl_SSL_library_init=yes
+  ac_cv_lib_ssl_SSL_CTX_set_msg_callback=yes
 else
-  ac_cv_lib_ssl_SSL_library_init=no
+  ac_cv_lib_ssl_SSL_CTX_set_msg_callback=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_ssl_SSL_library_init" >&5
-$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; }
-if test "x$ac_cv_lib_ssl_SSL_library_init" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&5
+$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" >&6; }
+if test "x$ac_cv_lib_ssl_SSL_CTX_set_msg_callback" = x""yes; then :
   have_openssl=yes
                        need_rsaref=no
 else
@@ -24464,11 +24464,11 @@ _ACEOF
 
 fi
 
-if test "$ol_enable_meta_async" != no ; then
+if test "$ol_enable_asyncmeta" != no ; then
        BUILD_SLAPD=yes
-       BUILD_ASYNCMETA=$ol_enable_meta_async
+       BUILD_ASYNCMETA=$ol_enable_asyncmeta
        BUILD_REWRITE=yes
-       if test "$ol_enable_meta_async" = mod ; then
+       if test "$ol_enable_asyncmeta" = mod ; then
                SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-asyncmeta"
                MFLAG=SLAPD_MOD_DYNAMIC
        else
@@ -26445,7 +26445,7 @@ rm -f $BACKENDSC
 cat > $BACKENDSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2016 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26496,7 +26496,7 @@ rm -f $OVERLAYSC
 cat > $OVERLAYSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2016 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without