fsf address update

[gnulib.git] / m4 / canon-host.m4

diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index 61f66a5..1e1275a 100644 (file)
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,15 +1,16 @@
-# canon-host.m4 serial 2
-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# canon-host.m4 serial 6
+dnl Copyright (C) 2002, 2003, 2004, 2005 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_CANON_HOST],
 [
+  AC_LIBSOURCES([canon-host.c])
+  AC_LIBOBJ([canon-host])
+
   dnl Prerequisites of lib/canon-host.c.
-  AC_CHECK_HEADERS_ONCE(stdlib.h string.h unistd.h)
+  AC_CHECK_HEADERS_ONCE(unistd.h)
   AC_CHECK_HEADERS(netdb.h sys/socket.h netinet/in.h arpa/inet.h)
 
   dnl Add any libraries as early as possible.
@@ -18,5 +19,5 @@ AC_DEFUN([gl_CANON_HOST],
   AC_SEARCH_LIBS(gethostbyname, [inet nsl])
 
   dnl These come from -lnsl on Solaris 2.5.1.
-  AC_CHECK_FUNCS(gethostbyname gethostbyaddr inet_ntoa)
+  AC_CHECK_FUNCS(getaddrinfo gethostbyname gethostbyaddr inet_ntoa)
 ])