Rename gl_INET_NTOP.

diff --git a/ChangeLog b/ChangeLog
index 17c806babe4fb022c235347e3ba201d9119b9733..43d99df351dac02c92a00054816a91217742ed05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-27  Bruno Haible  <bruno@clisp.org>
 
 2010-03-27  Bruno Haible  <bruno@clisp.org>
 

+       * 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.
 
        * 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 05fd2b6c4fa3bb8e7f64b8a2c041560daeed46e7..bc3066db188ad0976801996f4382709459032311 100644 (file)
--- 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,
 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_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])
   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 20e8d7c52e586316daed4db8303a89c3f2b5584c..a6d219c208e7b74b3acad9d7f3156c93ba3f7693 100644 (file)
--- 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.
 
 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 <arpa/inet.h> to declare inet_ntop.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 [
   dnl Persuade Solaris <arpa/inet.h> to declare inet_ntop.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])

diff --git a/modules/inet_ntop b/modules/inet_ntop
index 7e5c8dc78033f9f8d6b6a1d230cbba170018a13b..c6a1b80109ddca9f79aaf07851d1da6a1424b2fe 100644 (file)
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -14,7 +14,7 @@ netinet_in
 extensions
 
 configure.ac:
 extensions
 
 configure.ac:

-gl_INET_NTOP
+gl_FUNC_INET_NTOP

 gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
 
 Makefile.am:
 gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
 
 Makefile.am: