CVS shishi/gl/m4

[shishi-commit]

Update of /home/cvs/shishi/gl/m4
In directory dopio:/tmp/cvs-serv29329/gl/m4

Modified Files:
        getaddrinfo.m4 gnulib-comp.m4 gnulib-tool.m4 socklen.m4 
        stdint.m4 
Log Message:
Update.

--- /home/cvs/shishi/gl/m4/getaddrinfo.m4       2005/12/23 23:28:49     1.7
+++ /home/cvs/shishi/gl/m4/getaddrinfo.m4       2006/01/12 17:17:53     1.8
@@ -1,12 +1,12 @@
-# getaddrinfo.m4 serial 7
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# getaddrinfo.m4 serial 8
+dnl Copyright (C) 2004, 2005, 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.
 
 AC_DEFUN([gl_GETADDRINFO],
 [
-  AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
+  AC_SEARCH_LIBS(getaddrinfo, [nsl socket ws2_32])
   AC_SEARCH_LIBS(gethostbyname, [inet nsl wsock32])
   AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
   AC_REPLACE_FUNCS(getaddrinfo gai_strerror)
--- /home/cvs/shishi/gl/m4/gnulib-comp.m4       2005/12/15 09:22:05     1.7
+++ /home/cvs/shishi/gl/m4/gnulib-comp.m4       2006/01/12 17:17:53     1.8
@@ -18,6 +18,7 @@
 # any checks for libraries, header files, types and library functions.
 AC_DEFUN([gl_EARLY],
 [
+  AC_REQUIRE([AC_PROG_RANLIB])
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 ])
@@ -26,7 +27,7 @@
 # "Check for header files, types and library functions".
 AC_DEFUN([gl_INIT],
 [
-AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
+  AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
   gl_FUNC_ALLOCA
   gl_ALLOCSA
   gl_FUNC_BASE64
--- /home/cvs/shishi/gl/m4/gnulib-tool.m4       2005/09/19 16:04:42     1.1
+++ /home/cvs/shishi/gl/m4/gnulib-tool.m4       2006/01/12 17:17:53     1.2
@@ -1,5 +1,5 @@
-# gnulib-tool.m4 serial 1
-dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
+# gnulib-tool.m4 serial 2
+dnl Copyright (C) 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.
@@ -20,6 +20,9 @@
 dnl Usage: gl_M4_BASE([DIR])
 AC_DEFUN([gl_M4_BASE], [])
 
+dnl Usage: gl_AUX_BASE([DIR])
+AC_DEFUN([gl_AUX_BASE], [])
+
 dnl Usage: gl_LIB([LIBNAME])
 AC_DEFUN([gl_LIB], [])
 
--- /home/cvs/shishi/gl/m4/socklen.m4   2005/12/23 23:28:49     1.4
+++ /home/cvs/shishi/gl/m4/socklen.m4   2006/01/12 17:17:53     1.5
@@ -1,5 +1,5 @@
 # socklen.m4 serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 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.
@@ -39,8 +39,7 @@
          done
       ])
       if test "$gl_cv_socklen_t_equiv" = ""; then
-       AC_MSG_WARN([Cannot find a type to use in place of socklen_t, using 
int...])
-       gl_cv_socklen_t_equiv=int
+       AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
       fi
       AC_MSG_RESULT([$gl_cv_socklen_t_equiv])
       AC_DEFINE_UNQUOTED([socklen_t], [$gl_cv_socklen_t_equiv],
--- /home/cvs/shishi/gl/m4/stdint.m4    2005/10/12 13:24:42     1.1
+++ /home/cvs/shishi/gl/m4/stdint.m4    2006/01/12 17:17:53     1.2
@@ -1,4 +1,4 @@
-# stdint.m4 serial 4
+# stdint.m4 serial 5
 dnl Copyright (C) 2001-2002, 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,
@@ -12,6 +12,8 @@
 AC_REQUIRE([gt_HEADER_INTTYPES_H])
 dnl Check for <sys/inttypes.h>.
 AC_CHECK_HEADERS([sys/inttypes.h])
+dnl Check for <sys/bitypes.h> (used in Linux libc4 >= 4.6.7 and libc5).
+AC_CHECK_HEADERS([sys/bitypes.h])
 
 AC_MSG_CHECKING([for stdint.h])
 AC_CACHE_VAL(gl_cv_header_stdint_h, [