* _inttypes_h.m4 (gl_INTTYPES_H): Use AC_CHECK_DECLS_ONCE

with only one argument, for Autoconf 2.60.
* fileblocks.m4 (gl_PREREQ_FILEBLOCKS): AC_CHECK_DECLS_ONCE may
expand to nothing, so add a shell command to avoid syntax error.
* getpass.m4 (gl_PREREQ_GETPASS): Likewise.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c26cfe70cf0025b6b07423537a31231b61360993..cb3b724f39af4349060b478ff48b6c02d8b6297c 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * _inttypes_h.m4 (gl_INTTYPES_H): Use AC_CHECK_DECLS_ONCE
+       with only one argument, for Autoconf 2.60.
+       * fileblocks.m4 (gl_PREREQ_FILEBLOCKS): AC_CHECK_DECLS_ONCE may
+       expand to nothing, so add a shell command to avoid syntax error.
+       * getpass.m4 (gl_PREREQ_GETPASS): Likewise.
+
 2006-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't check for getenv decl;

diff --git a/m4/_inttypes_h.m4 b/m4/_inttypes_h.m4
index 324c37a73ddb05c0976e2aff5957e80d789214f4..791c472b1672525436e0644b991c2d68d61d2f7b 100644 (file)
--- a/m4/_inttypes_h.m4
+++ b/m4/_inttypes_h.m4
@@ -1,4 +1,4 @@
-# _inttypes_h.m4 serial 3
+# _inttypes_h.m4 serial 4
 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,
@@ -12,5 +12,6 @@ AC_LIBSOURCES([inttypes.h])
 if test $gl_cv_have_include_next = no; then
   gl_ABSOLUTE_HEADER([inttypes.h])
 fi
-AC_CHECK_DECLS_ONCE([strtoimax strtoumax])dnl
+AC_CHECK_DECLS_ONCE([strtoimax])dnl
+AC_CHECK_DECLS_ONCE([strtoumax])dnl
 ])

diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4
index 6bd971d4b0d2178111d9c3f40e9e4b4efeed61e3..5fb631112ee7fb7b2aad240079f79b679e8a531f 100644 (file)
--- a/m4/fileblocks.m4
+++ b/m4/fileblocks.m4
@@ -1,5 +1,5 @@
-# fileblocks.m4 serial 3
-dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+# fileblocks.m4 serial 4
+dnl Copyright (C) 2002, 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.
@@ -16,4 +16,5 @@ AC_DEFUN([gl_FILEBLOCKS],
 # Prerequisites of lib/fileblocks.c.
 AC_DEFUN([gl_PREREQ_FILEBLOCKS], [
   AC_CHECK_HEADERS_ONCE(sys/param.h)
+  :
 ])

diff --git a/m4/getpass.m4 b/m4/getpass.m4
index ba6815f61f231ff0029e608618d032e96c76460a..44c24d030aef1bdcbb8128a4584396d7e8bf0f3c 100644 (file)
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 7
+# getpass.m4 serial 8
 dnl Copyright (C) 2002-2003, 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,
@@ -42,4 +42,5 @@ AC_DEFUN([gl_PREREQ_GETPASS], [
   AC_CHECK_DECLS_ONCE([fputs_unlocked])
   AC_CHECK_DECLS_ONCE([funlockfile])
   AC_CHECK_DECLS_ONCE([putc_unlocked])
+  :
 ])