diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-11-06 08:44:20 +0100 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-11-06 08:44:20 +0100 |
| commit | c7856b3ddac48deb34c55ae50ab0ff0ffa5922d3 (patch) | |
| tree | 63df62f04cbc3a1dfdd8f24c0ad2ee0ddac561c4 /gl | |
| parent | 31183cf97cc8693f0d7064074061512ddbb97d86 (diff) | |
| download | gnutls-c7856b3ddac48deb34c55ae50ab0ff0ffa5922d3.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl')
| -rw-r--r-- | gl/m4/getaddrinfo.m4 | 9 | ||||
| -rw-r--r-- | gl/m4/gnulib-comp.m4 | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gl/m4/getaddrinfo.m4 b/gl/m4/getaddrinfo.m4 index 3dfc17d536..526dce5ba1 100644 --- a/gl/m4/getaddrinfo.m4 +++ b/gl/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/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index f4bf32e54a..aebcc99a5d 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -124,6 +124,7 @@ AC_SUBST([LTALLOCA]) AC_PROG_MKDIR_P gl_FUNC_PERROR gl_STRING_MODULE_INDICATOR([perror]) + AC_PATH_PROG([PMCCABE], [pmccabe], [false]) AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>]) AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>]) gl_FUNC_READ_FILE |