summaryrefslogtreecommitdiff
path: root/gnulib-m4/inet_pton.m4
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2026-03-10 13:24:07 +0100
committerJörg Frings-Fürst <debian@jff.email>2026-03-10 13:24:07 +0100
commitcfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch)
tree8016486f8ee7157213f2d09ff2491bfa9c94638a /gnulib-m4/inet_pton.m4
parent14e4d584d0121031ec40e6c35869745f1747ff29 (diff)
parent1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff)
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'gnulib-m4/inet_pton.m4')
-rw-r--r--gnulib-m4/inet_pton.m48
1 files changed, 5 insertions, 3 deletions
diff --git a/gnulib-m4/inet_pton.m4 b/gnulib-m4/inet_pton.m4
index 28ae9c06..150c3a07 100644
--- a/gnulib-m4/inet_pton.m4
+++ b/gnulib-m4/inet_pton.m4
@@ -1,9 +1,10 @@
# inet_pton.m4
-# serial 20
-dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc.
+# serial 21
+dnl Copyright (C) 2006, 2008-2026 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.
+dnl This file is offered as-is, without any warranty.
AC_DEFUN([gl_FUNC_INET_PTON],
[
@@ -18,6 +19,7 @@ AC_DEFUN([gl_FUNC_INET_PTON],
dnl Solaris 8..10 provide inet_pton in libnsl instead.
dnl Solaris 2.6..7 provide inet_pton in libresolv instead.
dnl Haiku provides it in -lnetwork.
+ dnl QNX provides it in -lsocket.
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).
@@ -38,7 +40,7 @@ AC_DEFUN([gl_FUNC_INET_PTON],
fi
else
gl_saved_LIBS=$LIBS
- AC_SEARCH_LIBS([inet_pton], [nsl resolv network], [],
+ AC_SEARCH_LIBS([inet_pton], [nsl resolv network socket], [],
[AC_CHECK_FUNCS([inet_pton])
if test $ac_cv_func_inet_pton = no; then
HAVE_INET_PTON=0