From e8a7203afd6a7e75c04c35ae2e329fca364e900a Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 2 Dec 2025 16:26:54 +0000 Subject: [PATCH] ITS#6938, ITS#9739 - Regenerate configure --- configure | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 5dc5bf1dd5..44bfa278ed 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: be79344c88df9c1cdb7fd7f22c066092258afdce . +# From configure.ac Id: 82e4edabd0e1b283a2186434f3d02ed61ce72cb7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71. # @@ -3288,6 +3288,10 @@ ac_config_headers="$ac_config_headers include/ldap_features.h:include/ldap_featu ac_config_headers="$ac_config_headers include/lber_types.h:include/lber_types.hin" +ac_config_headers="$ac_config_headers include/liblber-config.h:include/liblber-config.hin" + +ac_config_headers="$ac_config_headers include/libldap-config.h:include/libldap-config.hin" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking configure arguments" >&5 printf %s "checking configure arguments... " >&6; } @@ -18194,8 +18198,12 @@ else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#ifdef HAVE_WINSOCK2_H +#include +#else #include #include +#endif int main (void) @@ -18218,15 +18226,11 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ol_cv_struct_sockaddr_storage" >&5 printf "%s\n" "$ol_cv_struct_sockaddr_storage" >&6; } - if test $ol_cv_inet6_addrstrlen = yes && - test $ol_cv_struct_sockaddr_storage = yes ; then - ol_link_ipv6=yes - elif test $ol_enable_ipv6 = yes && - test $ol_cv_inet6_addrstrlen = no ; then - as_fn_error $? "IPv6 support requires INET6_ADDRSTRLEN" "$LINENO" 5 - elif test $ol_enable_ipv6 = yes && + if test $ol_enable_ipv6 = yes && test $ol_cv_struct_sockaddr_storage = no ; then as_fn_error $? "IPv6 support requires struct sockaddr_storage" "$LINENO" 5 + else + ol_link_ipv6=yes fi fi @@ -27757,6 +27761,8 @@ do "include/portable.h") CONFIG_HEADERS="$CONFIG_HEADERS include/portable.h:include/portable.hin:include/slapd-modules.hin" ;; "include/ldap_features.h") CONFIG_HEADERS="$CONFIG_HEADERS include/ldap_features.h:include/ldap_features.hin" ;; "include/lber_types.h") CONFIG_HEADERS="$CONFIG_HEADERS include/lber_types.h:include/lber_types.hin" ;; + "include/liblber-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/liblber-config.h:include/liblber-config.hin" ;; + "include/libldap-config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/libldap-config.h:include/libldap-config.hin" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:build/top.mk:Makefile.in:build/dir.mk" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk" ;; -- 2.47.3