[Cvs-cvs] ccvs/m4 ChangeLog fnmatch.m4 getaddrinfo.m4 gnu...

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/06/29 12:12:34

Modified files:
        m4             : ChangeLog fnmatch.m4 getaddrinfo.m4 
                         gnulib-comp.m4 mbiter.m4 strftime.m4 
Added files:
        m4             : inet_ntop.m4 wcwidth.m4 

Log message:
        * inet_ntop.m4, wcwidth.m4: New files from GNULIB.
        * fnmatch.m4, getaddrinfo.m4, gnulib-comp.m4, mbiter.m4, strftime.m4:
        Update from GNULIB.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/ChangeLog?cvsroot=cvs&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/fnmatch.m4?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/getaddrinfo.m4?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/gnulib-comp.m4?cvsroot=cvs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/mbiter.m4?cvsroot=cvs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/strftime.m4?cvsroot=cvs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/inet_ntop.m4?cvsroot=cvs&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/ccvs/m4/wcwidth.m4?cvsroot=cvs&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- ChangeLog   27 Jun 2006 16:38:04 -0000      1.176
+++ ChangeLog   29 Jun 2006 12:12:34 -0000      1.177
@@ -1,3 +1,9 @@
+2006-06-29  Derek Price  <address@hidden>
+
+       * inet_ntop.m4, wcwidth.m4: New files from GNULIB.
+       * fnmatch.m4, getaddrinfo.m4, gnulib-comp.m4, mbiter.m4, strftime.m4:
+       Update from GNULIB.
+
 2006-06-27  Mark D. Baushke  <address@hidden>
 
        * stdint.m4: Update from gnulib.

Index: fnmatch.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/fnmatch.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fnmatch.m4  4 Oct 2005 02:33:12 -0000       1.4
+++ fnmatch.m4  29 Jun 2006 12:12:34 -0000      1.5
@@ -3,7 +3,7 @@
 # This is a modified version of autoconf's AC_FUNC_FNMATCH.
 # This file should be simplified after Autoconf 2.57 is required.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
 # Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -61,8 +61,7 @@
 # ------------------
 # Prepare the replacement of fnmatch.
 AC_DEFUN([_AC_LIBOBJ_FNMATCH],
-[AC_REQUIRE([AC_C_CONST])dnl
-AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+[AC_REQUIRE([AC_FUNC_ALLOCA])dnl
 AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
 AC_CHECK_DECLS([getenv])
 AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])

Index: getaddrinfo.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/getaddrinfo.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- getaddrinfo.m4      22 Jun 2006 19:04:35 -0000      1.5
+++ getaddrinfo.m4      29 Jun 2006 12:12:34 -0000      1.6
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 9
+# getaddrinfo.m4 serial 10
 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,
@@ -6,7 +6,7 @@
 
 AC_DEFUN([gl_GETADDRINFO],
 [
-  AC_MSG_NOTICE([checking how to do getaddrinfo])
+  AC_MSG_NOTICE([checking how to do getaddrinfo, freeaddrinfo and getnameinfo])
 
   AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
   AC_CHECK_FUNCS(getaddrinfo,, [
@@ -58,7 +58,7 @@
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
-  AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
+  AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo],,,[
   /* 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. */

Index: gnulib-comp.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/gnulib-comp.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnulib-comp.m4      13 May 2006 20:47:48 -0000      1.16
+++ gnulib-comp.m4      29 Jun 2006 12:12:34 -0000      1.17
@@ -65,6 +65,7 @@
   gl_GETTIME
   AC_FUNC_GETTIMEOFDAY_CLOBBER
   gl_GLOB
+  gl_INET_NTOP
   gl_INTTYPES_H
   gl_FUNC_LSTAT
   AC_FUNC_MALLOC
@@ -118,6 +119,7 @@
   gl_FUNC_GLIBC_UNLOCKED_IO
   gl_FUNC_VASNPRINTF
   gl_FUNC_VASPRINTF
+  gl_FUNC_WCWIDTH
   gl_XALLOC
   gl_XGETCWD
   gl_XREADLINK
@@ -204,6 +206,8 @@
   lib/glob-libc.h
   lib/glob.c
   lib/glob_.h
+  lib/inet_ntop.c
+  lib/inet_ntop.h
   lib/intprops.h
   lib/inttypes.h
   lib/lstat.c
@@ -292,6 +296,7 @@
   lib/vasprintf.c
   lib/vasprintf.h
   lib/verify.h
+  lib/wcwidth.h
   lib/xalloc-die.c
   lib/xalloc.h
   lib/xgetcwd.c
@@ -353,6 +358,7 @@
   m4/glob.m4
   m4/iconv.m4
   m4/include_next.m4
+  m4/inet_ntop.m4
   m4/intdiv0.m4
   m4/intmax.m4
   m4/intmax_t.m4
@@ -432,6 +438,7 @@
   m4/vasnprintf.m4
   m4/vasprintf.m4
   m4/wchar_t.m4
+  m4/wcwidth.m4
   m4/wint_t.m4
   m4/xalloc.m4
   m4/xgetcwd.m4

Index: mbiter.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/mbiter.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- mbiter.m4   7 Apr 2006 17:18:09 -0000       1.4
+++ mbiter.m4   29 Jun 2006 12:12:34 -0000      1.5
@@ -9,7 +9,6 @@
 
 AC_DEFUN([gl_MBITER],
 [
-  AC_CHECK_FUNCS_ONCE(mbsinit)
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   dnl The following line is that so the user can test HAVE_MBRTOWC before
   dnl #include "mbiter.h" or "mbuiter.h".

Index: strftime.m4
===================================================================
RCS file: /cvsroot/cvs/ccvs/m4/strftime.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- strftime.m4 12 Aug 2005 20:57:46 -0000      1.5
+++ strftime.m4 29 Jun 2006 12:12:34 -0000      1.6
@@ -1,6 +1,6 @@
-#serial 25
+#serial 26
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -11,7 +11,6 @@
 
 AC_DEFUN([gl_FUNC_GNU_STRFTIME],
 [AC_REQUIRE([gl_FUNC_STRFTIME])dnl
- AC_REQUIRE([AC_C_CONST])dnl
 ])
 
 # These are the prerequisite macros for GNU's strftime.c replacement.

Index: inet_ntop.m4
===================================================================
RCS file: inet_ntop.m4
diff -N inet_ntop.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ inet_ntop.m4        29 Jun 2006 12:12:34 -0000      1.1
@@ -0,0 +1,18 @@
+# inet_ntop.m4 serial 2
+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.
+
+AC_DEFUN([gl_INET_NTOP],
+[
+  AC_REPLACE_FUNCS(inet_ntop)
+  gl_PREREQ_INET_NTOP
+])
+
+# Prerequisites of lib/inet_ntop.h and lib/inet_ntop.c.
+AC_DEFUN([gl_PREREQ_INET_NTOP], [
+  AC_CHECK_HEADERS_ONCE(arpa/inet.h)
+  AC_CHECK_DECLS([inet_ntop],,,[#include <arpa/inet.h>])
+  AC_REQUIRE([gl_SOCKET_FAMILIES])
+])

Index: wcwidth.m4
===================================================================
RCS file: wcwidth.m4
diff -N wcwidth.m4
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ wcwidth.m4  29 Jun 2006 12:12:34 -0000      1.1
@@ -0,0 +1,40 @@
+# wcwidth.m4 serial 2
+dnl Copyright (C) 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_FUNC_WCWIDTH],
+[
+  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  AC_REQUIRE([AC_GNU_SOURCE])
+
+  AC_REQUIRE([AC_C_INLINE])
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+
+  AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
+  AC_CHECK_FUNCS_ONCE([iswprint wcwidth])
+
+  AC_CACHE_CHECK([whether wcwidth is declared], [ac_cv_have_decl_wcwidth],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+/* AIX 3.2.5 declares wcwidth in <string.h>. */
+#if HAVE_STRING_H
+# include <string.h>
+#endif
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+], [
+#ifndef wcwidth
+  char *p = (char *) wcwidth;
+#endif
+])], [ac_cv_have_decl_wcwidth=yes], [ac_cv_have_decl_wcwidth=no])])
+  if test $ac_cv_have_decl_wcwidth = yes; then
+    ac_val=1
+  else
+    ac_val=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_WCWIDTH], [$ac_val],
+    [Define to 1 if you have the declaration of wcwidth(), and to 0
+     otherwise.])
+])