From 6123d7d37e64bc4e08924a6f2c21fd71dc63ec3e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 6 Jul 2006 22:16:59 +0000 Subject: [PATCH] * _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. --- m4/ChangeLog | 8 ++++++++ m4/_inttypes_h.m4 | 5 +++-- m4/fileblocks.m4 | 5 +++-- m4/getpass.m4 | 3 ++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index c26cfe70c..cb3b724f3 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,11 @@ +2006-07-06 Ralf Wildenhues + + * _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 * fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Don't check for getenv decl; diff --git a/m4/_inttypes_h.m4 b/m4/_inttypes_h.m4 index 324c37a73..791c472b1 100644 --- 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 6bd971d4b..5fb631112 100644 --- 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 ba6815f61..44c24d030 100644 --- 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]) + : ]) -- 2.11.0