CVS shishi/gl/m4

[shishi-commit]

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

Modified Files:
        getopt.m4 getpass.m4 gnulib.m4 setenv.m4 
Log Message:
Update.

--- /home/cvs/shishi/gl/m4/getopt.m4    2004/08/01 14:31:05     1.4
+++ /home/cvs/shishi/gl/m4/getopt.m4    2004/11/08 14:50:18     1.5
@@ -1,4 +1,4 @@
-# getopt.m4 serial 3
+# getopt.m4 serial 4
 dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -38,6 +38,10 @@
   AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
   AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
 
+  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 -n "$GETOPT_H"; then
      gl_GETOPT_SUBSTITUTE
   fi
--- /home/cvs/shishi/gl/m4/getpass.m4   2004/09/02 19:43:30     1.1
+++ /home/cvs/shishi/gl/m4/getpass.m4   2004/11/08 14:50:18     1.2
@@ -34,5 +34,6 @@
 # Prerequisites of lib/getpass.c.
 AC_DEFUN([gl_PREREQ_GETPASS], [
   AC_CHECK_HEADERS_ONCE(stdio_ext.h)
+  AC_CHECK_DECLS_ONCE([fflush_unlocked flockfile fputs_unlocked funlockfile 
putc_unlocked])
   :
 ])
--- /home/cvs/shishi/gl/m4/gnulib.m4    2004/10/05 18:54:42     1.12
+++ /home/cvs/shishi/gl/m4/gnulib.m4    2004/11/08 14:50:18     1.13
@@ -19,6 +19,10 @@
 AC_DEFUN([gl_INIT],
 [
   gl_FUNC_ALLOCA
+changequote(,)dnl
+LTALLOCA=`echo "$ALLOCA" | sed 's/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'`
+changequote([, ])dnl
+AC_SUBST(LTALLOCA)
   gl_FUNC_ALLOCA
   gl_ALLOCSA
   gl_ERROR
--- /home/cvs/shishi/gl/m4/setenv.m4    2003/09/14 21:10:11     1.2
+++ /home/cvs/shishi/gl/m4/setenv.m4    2004/11/08 14:50:18     1.3
@@ -1,5 +1,5 @@
-# setenv.m4 serial 4
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# setenv.m4 serial 5
+dnl Copyright (C) 2001-2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -14,6 +14,22 @@
   fi
   if test $ac_cv_func_unsetenv = no; then
     gl_PREREQ_UNSETENV
+  else
+    AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret,
+      [AC_TRY_COMPILE([#include <stdlib.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+int unsetenv (const char *name);
+#else
+int unsetenv();
+#endif
+], , gt_cv_func_unsetenv_ret='int', gt_cv_func_unsetenv_ret='void')])
+    if test $gt_cv_func_unsetenv_ret = 'void'; then
+      AC_DEFINE(VOID_UNSETENV, 1, [Define if unsetenv() returns void, not 
int.])
+    fi
   fi
 ])