Mercurial > gnulib
changeset 38909:2fb10296eb1e
inet_ntop, inet_pton: Determine needed library correctly on Haiku.
* m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Search also in libnetwork.
* m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 29 Oct 2017 02:59:41 +0200 |
parents | aa19959eb698 |
children | 88d574c4cb77 |
files | ChangeLog m4/inet_ntop.m4 m4/inet_pton.m4 |
diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Oct 29 02:22:19 2017 +0200 +++ b/ChangeLog Sun Oct 29 02:59:41 2017 +0200 @@ -1,3 +1,9 @@ +2017-10-28 Bruno Haible <bruno@clisp.org> + + inet_ntop, inet_pton: Determine needed library correctly on Haiku. + * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Search also in libnetwork. + * m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise. + 2017-10-28 Bruno Haible <bruno@clisp.org> ioctl: Override non-POSIX declaration on Haiku.
--- a/m4/inet_ntop.m4 Sun Oct 29 02:22:19 2017 +0200 +++ b/m4/inet_ntop.m4 Sun Oct 29 02:59:41 2017 +0200 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 19 +# inet_ntop.m4 serial 20 dnl Copyright (C) 2005-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,6 +16,7 @@ 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). @@ -35,7 +36,7 @@ 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
--- a/m4/inet_pton.m4 Sun Oct 29 02:22:19 2017 +0200 +++ b/m4/inet_pton.m4 Sun Oct 29 02:59:41 2017 +0200 @@ -1,4 +1,4 @@ -# inet_pton.m4 serial 17 +# inet_pton.m4 serial 18 dnl Copyright (C) 2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,6 +16,7 @@ dnl Most platforms that provide inet_pton define it in libc. 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 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). @@ -35,7 +36,7 @@ fi else gl_save_LIBS=$LIBS - AC_SEARCH_LIBS([inet_pton], [nsl resolv], [], + AC_SEARCH_LIBS([inet_pton], [nsl resolv network], [], [AC_CHECK_FUNCS([inet_pton]) if test $ac_cv_func_inet_pton = no; then HAVE_INET_PTON=0