From d11af4159eb8836696ef29f1e1ac9ad4db348d47 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 10 Jan 2006 17:47:56 +0000
Subject: Sync from gnulib.

---
 m4/ChangeLog       |  4 ++++
 m4/getaddrinfo.m4  | 28 ++++++++--------------------
 m4/localcharset.m4 |  5 +++--
 m4/md5.m4          |  5 +----
 4 files changed, 16 insertions(+), 26 deletions(-)

(limited to 'm4')

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 85ca5d93a..8e8c8d771 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-10  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* getaddrinfo.m4, localcharset.m4, md5.m4: Sync from gnulib.
+
 2006-01-10  Jim Meyering  <jim@meyering.net>
 
 	* fpending.m4: Also include <stdio.h>, for Dragonfly.
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index be44232d7..b3b7b0736 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 6
+# getaddrinfo.m4 serial 7
 dnl Copyright (C) 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,
@@ -19,30 +19,18 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
-  AC_CHECK_HEADERS_ONCE(sys/socket.h netdb.h sys/types.h netinet/in.h)
+  AC_CHECK_HEADERS_ONCE(netinet/in.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
   /* sys/types.h is not needed according to POSIX, but the
      sys/socket.h in i386-unknown-freebsd4.10 and
      powerpc-apple-darwin5.5 required it. */
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 ])
   AC_CHECK_TYPES([struct addrinfo],,,[
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 ])
 ])
diff --git a/m4/localcharset.m4 b/m4/localcharset.m4
index c92e1bb82..6863d3225 100644
--- a/m4/localcharset.m4
+++ b/m4/localcharset.m4
@@ -1,5 +1,5 @@
-# localcharset.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# localcharset.m4 serial 3
+dnl Copyright (C) 2002, 2004, 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.
@@ -9,6 +9,7 @@ AC_DEFUN([gl_LOCALCHARSET],
   dnl Prerequisites of lib/localcharset.c.
   AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
   AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CHECK_DECLS_ONCE(getc_unlocked)
   AC_CHECK_FUNCS_ONCE(setlocale)
 
   dnl Prerequisites of the lib/Makefile.am snippet.
diff --git a/m4/md5.m4 b/m4/md5.m4
index 729b6563c..0c4d86b59 100644
--- a/m4/md5.m4
+++ b/m4/md5.m4
@@ -1,4 +1,4 @@
-# md5.m4 serial 7
+# md5.m4 serial 8
 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,
@@ -9,9 +9,6 @@ AC_DEFUN([gl_MD5],
   AC_LIBSOURCES([md5.c, md5.h])
   AC_LIBOBJ([md5])
 
-  dnl Prerequisites of lib/md5.h.
-  AC_REQUIRE([gl_AC_TYPE_UINT32_T])
-
   dnl Prerequisites of lib/md5.c.
   AC_REQUIRE([AC_C_BIGENDIAN])
   :
-- 
cgit v1.2.3-54-g00ecf