CVS shishi/gl/m4

[shishi-commit]

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

Modified Files:
        clock_time.m4 getaddrinfo.m4 getopt.m4 getpass.m4 gettext.m4 
        gettimeofday.m4 gnulib.m4 
Log Message:
Update.

--- /home/cvs/shishi/gl/m4/clock_time.m4        2005/01/29 01:04:46     1.2
+++ /home/cvs/shishi/gl/m4/clock_time.m4        2005/05/26 15:07:56     1.3
@@ -1,5 +1,5 @@
-# clock_time.m4 serial 5
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# clock_time.m4 serial 6
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -16,11 +16,11 @@
   # Save and restore LIBS so e.g., -lrt, isn't added to it.  Otherwise, *all*
   # programs in the package would end up linked with that potentially-shared
   # library, inducing unnecessary run-time overhead.
-  fetish_saved_libs=$LIBS
+  gl_saved_libs=$LIBS
     AC_SEARCH_LIBS(clock_gettime, [rt posix4],
                    [test "$ac_cv_search_clock_gettime" = "none required" ||
                     LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
     AC_SUBST(LIB_CLOCK_GETTIME)
     AC_CHECK_FUNCS(clock_gettime clock_settime)
-  LIBS=$fetish_saved_libs
+  LIBS=$gl_saved_libs
 ])
--- /home/cvs/shishi/gl/m4/getaddrinfo.m4       2005/01/29 01:04:46     1.3
+++ /home/cvs/shishi/gl/m4/getaddrinfo.m4       2005/05/26 15:07:56     1.4
@@ -6,6 +6,7 @@
 
 AC_DEFUN([gl_GETADDRINFO],
 [
+  AC_SEARCH_LIBS(getaddrinfo, nsl socket)
   AC_REPLACE_FUNCS(getaddrinfo)
   gl_PREREQ_GETADDRINFO
 ])
--- /home/cvs/shishi/gl/m4/getopt.m4    2005/01/29 01:04:46     1.9
+++ /home/cvs/shishi/gl/m4/getopt.m4    2005/05/26 15:07:56     1.10
@@ -1,5 +1,5 @@
-# getopt.m4 serial 7
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+# getopt.m4 serial 9
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -26,11 +26,41 @@
   if test -z "$GETOPT_H"; then
     GETOPT_H=
     AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
-    AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
+    if test -z "$GETOPT_H"; then
+      AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
+    fi
 
     dnl BSD getopt_long uses an incompatible method to reset option processing,
     dnl and (as of 2004-10-15) mishandles optional option-arguments.
-    AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+    if test -z "$GETOPT_H"; then
+      AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+    fi
+
+    dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+    dnl option string (as of 2005-05-05).
+    if test -z "$GETOPT_H"; then
+      AC_CACHE_CHECK([for working GNU getopt function], 
[gl_cv_func_gnu_getopt],
+      [AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM([#include <getopt.h>],
+          [[
+            char *myargv[3];
+            myargv[0] = "conftest";
+            myargv[1] = "-+";
+            myargv[2] = 0;
+            return getopt (2, myargv, "+a") != '?';
+           ]])],
+        [gl_cv_func_gnu_getopt=yes],
+        [gl_cv_func_gnu_getopt=no],
+        [dnl cross compiling - pessimistically guess based on decls
+         dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+         dnl option string (as of 2005-05-05).
+         AC_CHECK_DECL([getopt_clip],
+          [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes],
+          [#include <getopt.h>])])])
+      if test "$gl_cv_func_gnu_getopt" = "no"; then
+       GETOPT_H=getopt.h
+      fi
+    fi
 
     if test -n "$GETOPT_H"; then
       gl_GETOPT_SUBSTITUTE
--- /home/cvs/shishi/gl/m4/getpass.m4   2005/03/21 22:11:17     1.4
+++ /home/cvs/shishi/gl/m4/getpass.m4   2005/05/26 15:07:56     1.5
@@ -7,6 +7,8 @@
 # Provide a getpass() function if the system doesn't have it.
 AC_DEFUN([gl_FUNC_GETPASS],
 [
+  AC_LIBSOURCES([getpass.c, getpass.h])
+
   AC_REPLACE_FUNCS(getpass)
   AC_CHECK_DECLS_ONCE(getpass)
   if test $ac_cv_func_getpass = no; then
--- /home/cvs/shishi/gl/m4/gettext.m4   2005/03/21 22:11:17     1.5
+++ /home/cvs/shishi/gl/m4/gettext.m4   2005/05/26 15:07:56     1.6
@@ -1,4 +1,4 @@
-# gettext.m4 serial 36 (gettext-0.14.3)
+# gettext.m4 serial 37 (gettext-0.14.4)
 dnl Copyright (C) 1995-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,
@@ -139,7 +139,7 @@
 ], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 
0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
             gt_cv_func_gnugettext_libc=yes,
             gt_cv_func_gnugettext_libc=no)])
 
@@ -175,7 +175,7 @@
 #endif
 const char *_nl_expand_alias (const char *);],
               [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 
0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
               gt_cv_func_gnugettext_libintl=yes,
               gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
@@ -196,7 +196,7 @@
 #endif
 const char *_nl_expand_alias (const char *);],
                 [bindtextdomain ("", "");
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 
0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext_libintl=yes
--- /home/cvs/shishi/gl/m4/gettimeofday.m4      2005/01/29 01:04:46     1.2
+++ /home/cvs/shishi/gl/m4/gettimeofday.m4      2005/05/26 15:07:56     1.3
@@ -1,6 +1,6 @@
-#serial 6
+#serial 7
 
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -62,8 +62,6 @@
 
     AC_DEFINE(gettimeofday, rpl_gettimeofday,
       [Define to rpl_gettimeofday if the replacement function should be used.])
-    AC_DEFINE(GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER, 1,
-      [Define if gettimeofday clobbers localtime's static buffer.])
     gl_PREREQ_GETTIMEOFDAY
   fi
 ])
--- /home/cvs/shishi/gl/m4/gnulib.m4    2005/01/02 00:18:38     1.19
+++ /home/cvs/shishi/gl/m4/gnulib.m4    2005/05/26 15:07:56     1.20
@@ -7,8 +7,8 @@
 #
 # Generated by gnulib-tool.
 #
-# Invoked as: gnulib-tool --import --automatic-prototypes
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --libtool  alloca-opt allocsa base64 error extensions 
getaddrinfo getdate getdomainname gethostname getline getopt getpass getsubopt 
gettext gettime gettimeofday mktime progname readlink realloc restrict setenv 
size_max stdbool strcase strchrnul strdup strndup strnlen strtok_r timegm 
time_r timespec vasnprintf vasprintf xalloc xgetdomainname xgethostname 
xreadlink xsize xstrndup xvasprintf
+# Invoked as: gnulib-tool --import
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl 
--m4-base=gl/m4 --aux-dir=. --libtool  alloca-opt allocsa base64 error 
extensions getaddrinfo getdate getdomainname gethostname getline getopt getpass 
getsubopt gettext gettime gettimeofday mktime progname readlink realloc 
restrict setenv size_max stdbool strcase strchrnul strdup strndup strnlen 
strtok_r timegm time_r timespec vasnprintf vasprintf xalloc xgetdomainname 
xgethostname xreadlink xsize xstrndup xvasprintf
 
 AC_DEFUN([gl_EARLY],
 [
@@ -44,7 +44,6 @@
   gl_STRCASE
   gl_FUNC_STRCHRNUL
   gl_FUNC_STRDUP
-  gl_AUTOPROTO_STRDUP
   gl_FUNC_STRNDUP
   gl_FUNC_STRNLEN
   gl_FUNC_STRTOK_R