X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcanon-host.m4;h=d13db20e491e8c597ca84f3177849c96d07a0a0b;hb=0adf8a67b854087b7623261527f7950052a31ddf;hp=bd7569a267ab28cbb46c44539d5b899cde7ba126;hpb=8b41ecf750e4a20e65943a14ce80d4a01f663dce;p=gnulib.git

diff --git a/m4/canon-host.m4 b/m4/canon-host.m4
index bd7569a26..d13db20e4 100644
--- a/m4/canon-host.m4
+++ b/m4/canon-host.m4
@@ -1,22 +1,15 @@
-# canon-host.m4 serial 4
-dnl Copyright (C) 2002, 2003, 2004 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 8
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 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],
 [
-  dnl Prerequisites of lib/canon-host.c.
-  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.
-  dnl In particular, inet_ntoa needs -lnsl at least on Solaris 2.5.1,
-  dnl so we have to add -lnsl to LIBS before checking for that function.
-  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+  AC_LIBOBJ([canon-host])
+  gl_PREREQ_CANON_HOST
+])
 
-  dnl These come from -lnsl on Solaris 2.5.1.
-  AC_CHECK_FUNCS(getaddrinfo gethostbyname gethostbyaddr inet_ntoa)
+AC_DEFUN([gl_PREREQ_CANON_HOST], [
+  AC_REQUIRE([gl_GETADDRINFO])
 ])