getaddrinfo: Simplify Link: directive.

diff --git a/ChangeLog b/ChangeLog
index 23f8426..7f87cf5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-06  Simon Josefsson  <simon@josefsson.org>
+
+       * m4/getaddrinfo.m4: Add content of INET_NTOP_LIB to
+       GETADDRINFO_LIB.  Bump serial number.
+       * modules/getaddrinfo (Link): Only mention GETADDRINFO_LIB again.
+       Suggested by Eric Blake <ebb9@byu.net>.
+
 2009-11-05  Eric Blake  <ebb9@byu.net>
 
        strtod: detect darwin bug

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 3dfc17d..526dce5 100644 (file)
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 21
+# getaddrinfo.m4 serial 22
 dnl Copyright (C) 2004-2009 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,6 +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([AC_C_RESTRICT])
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([gl_HEADER_SYS_SOCKET])
@@ -163,4 +164,10 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
     *" $SERVENT_LIB "*) ;;
     *) GETADDRINFO_LIB="$GETADDRINFO_LIB $SERVENT_LIB" ;;
   esac
+
+  dnl Append $INET_NTOP_LIB to GETADDRINFO_LIB, avoiding gratuitous duplicates.
+  case " $GETADDRINFO_LIB " in
+    *" $INET_NTOP_LIB "*) ;;
+    *) GETADDRINFO_LIB="$GETADDRINFO_LIB $INET_NTOP_LIB" ;;
+  esac
 ])

diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index 16a60ec..c8c6024 100644 (file)
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -29,7 +29,7 @@ Include:
 <netdb.h>
 
 Link:
-$(GETADDRINFO_LIB) $(INET_NTOP_LIB)
+$(GETADDRINFO_LIB)
 
 License:
 LGPLv2+