[Cvs-cvs] Changes to ccvs/m4/canon-host.m4

[Derek Robert Price]

Index: ccvs/m4/canon-host.m4
diff -u ccvs/m4/canon-host.m4:1.1 ccvs/m4/canon-host.m4:1.2
--- ccvs/m4/canon-host.m4:1.1   Sun Sep  4 15:22:40 2005
+++ ccvs/m4/canon-host.m4       Tue Sep  6 04:51:36 2005
@@ -1,4 +1,4 @@
-# canon-host.m4 serial 6
+# canon-host.m4 serial 7
 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,
@@ -6,18 +6,11 @@
 
 AC_DEFUN([gl_CANON_HOST],
 [
-  AC_LIBSOURCES([canon-host.c])
+  AC_LIBSOURCES([canon-host.c, canon-host.h])
   AC_LIBOBJ([canon-host])
+  gl_PREREQ_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])
-
-  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])
 ])