New upstream version 2.3.4
This commit is contained in:
parent
e7bdd1c6c6
commit
de72f6f588
556 changed files with 90432 additions and 53391 deletions
|
@ -1,5 +1,5 @@
|
|||
# inet_ntop.m4 serial 19
|
||||
dnl Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc.
|
||||
# inet_ntop.m4 serial 21
|
||||
dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
@ -16,6 +16,7 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
|
|||
dnl Most platforms that provide inet_ntop define it in libc.
|
||||
dnl Solaris 8..10 provide inet_ntop in libnsl instead.
|
||||
dnl Solaris 2.6..7 provide inet_ntop in libresolv instead.
|
||||
dnl Haiku provides it in -lnetwork.
|
||||
dnl Native Windows provides it in -lws2_32 instead, with a declaration in
|
||||
dnl <ws2tcpip.h>, and it uses stdcall calling convention, not cdecl
|
||||
dnl (hence we cannot use AC_CHECK_FUNCS, AC_SEARCH_LIBS to find it).
|
||||
|
@ -23,19 +24,20 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
|
|||
INET_NTOP_LIB=
|
||||
gl_PREREQ_SYS_H_WINSOCK2
|
||||
if test $HAVE_WINSOCK2_H = 1; then
|
||||
dnl It needs to be overridden, because the stdcall calling convention
|
||||
dnl is not compliant with POSIX. Set REPLACE_INET_NTOP in order to avoid
|
||||
dnl a name conflict at the linker level, even though the header file
|
||||
dnl <ws2tcpip.h> declares inet_ntop only if _WIN32_WINNT >= 0x0600.
|
||||
REPLACE_INET_NTOP=1
|
||||
AC_CHECK_DECLS([inet_ntop],,, [[#include <ws2tcpip.h>]])
|
||||
if test $ac_cv_have_decl_inet_ntop = yes; then
|
||||
dnl It needs to be overridden, because the stdcall calling convention
|
||||
dnl is not compliant with POSIX.
|
||||
REPLACE_INET_NTOP=1
|
||||
INET_NTOP_LIB="-lws2_32"
|
||||
else
|
||||
HAVE_DECL_INET_NTOP=0
|
||||
HAVE_INET_NTOP=0
|
||||
fi
|
||||
else
|
||||
gl_save_LIBS=$LIBS
|
||||
AC_SEARCH_LIBS([inet_ntop], [nsl resolv], [],
|
||||
AC_SEARCH_LIBS([inet_ntop], [nsl resolv network], [],
|
||||
[AC_CHECK_FUNCS([inet_ntop])
|
||||
if test $ac_cv_func_inet_ntop = no; then
|
||||
HAVE_INET_NTOP=0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue