From e83265145bd1fbf40917a0a7099041bd148fb6b6 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 11 Jan 2025 15:38:49 +0100 Subject: [PATCH] sys_socket-h: Fix configuration mistake (regression yesterday). * m4/sys_socket_h.m4 (gl_SYS_SOCKET_H): Test ac_cv_type_struct_sockaddr_storage after invoking gl_PREREQ_SYS_SA_FAMILY, not before. --- ChangeLog | 7 +++++++ m4/sys_socket_h.m4 | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87b37005da..a61301e79c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-01-11 Bruno Haible + + sys_socket-h: Fix configuration mistake (regression yesterday). + * m4/sys_socket_h.m4 (gl_SYS_SOCKET_H): Test + ac_cv_type_struct_sockaddr_storage after invoking + gl_PREREQ_SYS_SA_FAMILY, not before. + 2025-01-11 Bruno Haible eealloc, malloca: Fix module dependencies. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 08b1c6d929..fb69209b4d 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 -# serial 30 +# serial 31 dnl Copyright (C) 2005-2025 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -53,10 +53,10 @@ AC_DEFUN_ONCE([gl_SYS_SOCKET_H], fi # We need to check for ws2tcpip.h now. gl_PREREQ_SYS_H_SOCKET + gl_PREREQ_SYS_SA_FAMILY if test $ac_cv_type_struct_sockaddr_storage = no; then HAVE_STRUCT_SOCKADDR_STORAGE=0 fi - gl_PREREQ_SYS_SA_FAMILY if test $ac_cv_type_struct_sockaddr_storage != no; then AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family], [], -- 2.39.5