From 17fdfe319a18b4467acc3bb14779cbad0adab684 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 27 Mar 2010 14:01:23 +0100 Subject: [PATCH] Rename gl_INET_NTOP. --- ChangeLog | 4 ++++ m4/getaddrinfo.m4 | 4 ++-- m4/inet_ntop.m4 | 4 ++-- modules/inet_ntop | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17c806bab..43d99df35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-27 Bruno Haible + * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Renamed from gl_INET_NTOP. + * m4/getaddrinfo.m4 (gl_GETADDRINFO): Update. + * modules/inet_ntop (configure.ac): Update. + * m4/inet_pton.m4 (gl_FUNC_INET_PTON): Renamed from gl_INET_PTON. * modules/inet_pton (configure.ac): Update. diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 05fd2b6c4..bc3066db1 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 22 +# getaddrinfo.m4 serial 23 dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -96,7 +96,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB - AC_REQUIRE([gl_INET_NTOP]) dnl for INET_NTOP_LIB + AC_REQUIRE([gl_FUNC_INET_NTOP]) dnl for INET_NTOP_LIB AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_SOCKET_FAMILIES]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 20e8d7c52..a6d219c20 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,10 +1,10 @@ -# inet_ntop.m4 serial 11 +# inet_ntop.m4 serial 12 dnl Copyright (C) 2005, 2006, 2008, 2009, 2010 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. -AC_DEFUN([gl_INET_NTOP], +AC_DEFUN([gl_FUNC_INET_NTOP], [ dnl Persuade Solaris to declare inet_ntop. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) diff --git a/modules/inet_ntop b/modules/inet_ntop index 7e5c8dc78..c6a1b8010 100644 --- a/modules/inet_ntop +++ b/modules/inet_ntop @@ -14,7 +14,7 @@ netinet_in extensions configure.ac: -gl_INET_NTOP +gl_FUNC_INET_NTOP gl_ARPA_INET_MODULE_INDICATOR([inet_ntop]) Makefile.am: -- 2.11.0