From: Quanah Gibson-Mount Date: Mon, 15 May 2023 20:11:50 +0000 (+0000) Subject: ITS#10014, ITS#10039, ITS#10053 - Regenerate configure X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eee62b84a0202a4daabdf9a15bc7322427c4f111;p=thirdparty%2Fopenldap.git ITS#10014, ITS#10039, ITS#10053 - Regenerate configure --- diff --git a/aclocal.m4 b/aclocal.m4 index daf32af07e..8ccd66a86c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -12,9 +12,9 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -dnl serial 11 (pkg-config-0.29.1) -dnl +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -55,7 +55,7 @@ dnl dnl See the "Since" comment for each macro you use to see what version dnl of the macros you require. m4_defun([PKG_PREREQ], -[m4_define([PKG_MACROS_VERSION], [0.29.1]) +[m4_define([PKG_MACROS_VERSION], [0.29.2]) m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) ])dnl PKG_PREREQ @@ -156,7 +156,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -166,11 +166,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -187,7 +187,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full diff --git a/configure b/configure index 37d55de9d3..d6238a6c4e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: 7d291e863fc45c02b6ff195c031dfbaf1d3a06bb . +# From configure.ac Id: c4e2a905e214f634f2f50f92313c140b5c7b1446 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # @@ -811,7 +811,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -973,7 +972,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -1226,15 +1224,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1372,7 +1361,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1525,7 +1514,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1644,7 +1632,7 @@ Optional Packages: --with-systemd with systemd service notification support [auto] --with-fetch with fetch(3) URL support [auto] --with-threads with threads library auto|nt|posix|pth|lwp|manual [auto] - --with-tls with TLS/SSL support auto|openssl|gnutls [auto] + --with-tls with TLS/SSL support auto|openssl|gnutls|mbedtls [auto] --with-yielding-select with implicitly yielding select [auto] --with-mp with multiple precision statistics auto|longlong|long|bignum|gmp [auto] @@ -3205,7 +3193,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 mbedtls yes no ; do if test "$withval" = "$ol_val" ; then ol_arg="$ol_val" fi @@ -15340,7 +15328,6 @@ for ac_header in \ locale.h \ malloc.h \ memory.h \ - psap.h \ pwd.h \ process.h \ sgtty.h \ @@ -17169,9 +17156,9 @@ See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.err conftest.i conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_export_keying_material_early in -lssl" >&5 -$as_echo_n "checking for SSL_export_keying_material_early in -lssl... " >&6; } -if ${ac_cv_lib_ssl_SSL_export_keying_material_early+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_ciphersuites in -lssl" >&5 +$as_echo_n "checking for SSL_CTX_set_ciphersuites in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_CTX_set_ciphersuites+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17185,27 +17172,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char SSL_export_keying_material_early (); +char SSL_CTX_set_ciphersuites (); int main () { -return SSL_export_keying_material_early (); +return SSL_CTX_set_ciphersuites (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ssl_SSL_export_keying_material_early=yes + ac_cv_lib_ssl_SSL_CTX_set_ciphersuites=yes else - ac_cv_lib_ssl_SSL_export_keying_material_early=no + ac_cv_lib_ssl_SSL_CTX_set_ciphersuites=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_export_keying_material_early" >&5 -$as_echo "$ac_cv_lib_ssl_SSL_export_keying_material_early" >&6; } -if test "x$ac_cv_lib_ssl_SSL_export_keying_material_early" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_CTX_set_ciphersuites" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_CTX_set_ciphersuites" >&6; } +if test "x$ac_cv_lib_ssl_SSL_CTX_set_ciphersuites" = xyes; then : have_openssl=yes else have_openssl=no @@ -17317,6 +17304,97 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h fi fi +if test $ol_link_tls = no ; then + if test $ol_with_tls = mbedtls || test $ol_with_tls = auto ; then + for ac_header in mbedtls/ssl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "mbedtls/ssl.h" "ac_cv_header_mbedtls_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_mbedtls_ssl_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_MBEDTLS_SSL_H 1 +_ACEOF + +fi + +done + + + if test $ac_cv_header_mbedtls_ssl_h = yes ; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#if MBEDTLS_VERSION_NUMBER < 0x02120000 +#error "mbedtls is too old" +#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 $? "mbedtls 2.18.0 or newer required +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbedtls_ssl_init in -lmbedtls" >&5 +$as_echo_n "checking for mbedtls_ssl_init in -lmbedtls... " >&6; } +if ${ac_cv_lib_mbedtls_mbedtls_ssl_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmbedtls -lmbedx509 -lmbedcrypto $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 mbedtls_ssl_init (); +int +main () +{ +return mbedtls_ssl_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mbedtls_mbedtls_ssl_init=yes +else + ac_cv_lib_mbedtls_mbedtls_ssl_init=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_mbedtls_mbedtls_ssl_init" >&5 +$as_echo "$ac_cv_lib_mbedtls_mbedtls_ssl_init" >&6; } +if test "x$ac_cv_lib_mbedtls_mbedtls_ssl_init" = xyes; then : + have_mbedtls=yes +else + have_mbedtls=no +fi + + + if test $have_mbedtls = yes ; then + ol_with_tls=mbedtls + ol_link_tls=yes + WITH_TLS_TYPE=mbedtls + + TLS_LIBS="-lmbedtls -lmbedx509 -lmbedcrypto" + + +$as_echo "#define HAVE_MBEDTLS 1" >>confdefs.h + + fi + fi + fi +fi + WITH_TLS=no if test $ol_link_tls = yes ; then @@ -22310,8 +22388,8 @@ $as_echo "no" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WT" >&5 -$as_echo_n "checking for WT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wiredtiger" >&5 +$as_echo_n "checking for wiredtiger... " >&6; } if test -n "$WT_CFLAGS"; then pkg_cv_WT_CFLAGS="$WT_CFLAGS" @@ -22351,7 +22429,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -22378,7 +22456,7 @@ Alternatively, you may set the environment variables WT_CFLAGS and WT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} diff --git a/include/portable.hin b/include/portable.hin index 2463b90947..835baa0865 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -343,6 +343,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MALLOC_H +/* define if you have mbedtls */ +#undef HAVE_MBEDTLS + +/* Define to 1 if you have the header file. */ +#undef HAVE_MBEDTLS_SSL_H + /* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY @@ -406,9 +412,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_PROCESS_H -/* Define to 1 if you have the header file. */ -#undef HAVE_PSAP_H - /* define to pthreads API spec revision */ #undef HAVE_PTHREADS