ITS#8752 additional debug info, thread ID of rmutex lockers

[openldap] / configure

diff --git a/configure b/configure
index 37e4702b2c2ecb920f60d4e957a111f22150090c..8f36acd5b4116b6f1cf491fcf44dd79824b00cd0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,9 +1,9 @@
 #! /bin/sh
-# From configure.in Id: 792cf0cd7da87fae39dca56961bcad11cf8b3d38 .
+# From configure.in Id: 1d890c0e9e803aa5e0cf51a1d63ad69fb1670555 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
-# Copyright 1998-2013 The OpenLDAP Foundation. All rights reserved.
+# Copyright 1998-2017 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-2013 The OpenLDAP Foundation. All rights reserved.
+Copyright 1998-2017 The OpenLDAP Foundation. All rights reserved.
 Restrictions apply, see COPYRIGHT and LICENSE files.
 _ACEOF
   exit
@@ -15475,9 +15475,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
@@ -15491,27 +15491,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
@@ -15639,6 +15639,23 @@ done
 
 
                if test $ac_cv_header_gnutls_gnutls_h = yes ; then
+                       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <gnutls/gnutls.h>
+#if GNUTLS_VERSION_NUMBER < 0x020c00
+#error "GnuTLS 2.12.0 or newer required"
+#endif
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "GnuTLS is too old
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest.err conftest.$ac_ext
+
                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_init in -lgnutls" >&5
 $as_echo_n "checking for gnutls_init in -lgnutls... " >&6; }
 if test "${ac_cv_lib_gnutls_gnutls_init+set}" = set; then :
@@ -20307,7 +20324,7 @@ else
 __db_version DB_VERSION_MAJOR
 
 _ACEOF
-       set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+       set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_major=${3}
 
 fi
@@ -20333,7 +20350,7 @@ else
 __db_version DB_VERSION_MINOR
 
 _ACEOF
-       set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+       set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
        ol_cv_bdb_minor=${3}
 
 fi
@@ -20361,13 +20378,19 @@ else
 #ifndef DB_VERSION_MINOR
 #      define DB_VERSION_MINOR 0
 #endif
+#ifndef DB_VERSION_PATCH
+#      define DB_VERSION_PATCH 0
+#endif
 
-#define DB_VERSION_MM  ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR)
+#define DB_VERSION_FULL        ((DB_VERSION_MAJOR<<16)|(DB_VERSION_MINOR<<8)|DB_VERSION_PATCH)
 
-/* require 4.4 or later */
-#if DB_VERSION_MM >= 0x0404
+/* require 4.4 or later, but less than 6.0.20 */
+#if DB_VERSION_FULL >= 0x040400 && DB_VERSION_FULL < 0x060014
        __db_version_compat
 #endif
+#if DB_VERSION_FULL >= 0x060014
+#error "BerkeleyDB 6.0.20+ license is incompatible with LDAP"
+#endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -21617,7 +21640,7 @@ done
 
 
        sql_LIBS="$LIBS"
-       LIBS="$LTHREAD_LIBS"
+       LIBS="$LTHREAD_LIBS $LIBS"
 
        if test $ol_with_odbc = auto ; then
                ol_with_odbc="iodbc unixodbc odbc32"
@@ -26206,7 +26229,7 @@ rm -f $BACKENDSC
 cat > $BACKENDSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26257,7 +26280,7 @@ rm -f $OVERLAYSC
 cat > $OVERLAYSC << ENDX
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2013 The OpenLDAP Foundation.
+ * Copyright 1998-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without