Re: getaddrinfo needs $(INET_NTOP_LIB)

[Simon Josefsson]

Eric Blake <address@hidden> writes:

> According to Simon Josefsson on 11/5/2009 7:28 AM:
>> Gnulib's getaddrinfo uses the inet-ntop module, but the link: directive
>> doesn't reflect this.  Pushed.
>> 
>>  Link:
>> -$(GETADDRINFO_LIB)
>> +$(GETADDRINFO_LIB) $(INET_NTOP_LIB)
>
> Wouldn't it be nicer to rewrite the getaddrinfo.m4 to guarantee that
> $(GETADDRINFO_LIB) contains the contents of $(INET_NTOP_LIB), so that
> there is only one link line?

Hm, good point.  How about this?

/Simon

diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index 3dfc17d..b1819d5 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -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
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -29,7 +29,7 @@ Include:
 <netdb.h>
 
 Link:
-$(GETADDRINFO_LIB) $(INET_NTOP_LIB)
+$(GETADDRINFO_LIB)
 
 License:
 LGPLv2+