Re: prepare for autoconf-2.60

[Bruno Haible]

Paul Eggert wrote:
> > + But about AC_CHECK_DECLS_ONCE: note that in
> > + autoconf >= 2.60 the symbol separator is a comma, whereas here it is
> > + whitespace.
>
> I hadn't noticed this incompatibility.  It is a real hassle.

The comma separator in autoconf's AC_CHECK_DECLS is a hassle, because it's
the delimiter between different arguments in m4. That's why I used normal
space-separated lists in the gnulib macro.

Anyway, for the time of migration, we can limit our uses of AC_CHECK_DECLS_ONCE
to a single function name; see attached patch.

> gnulib-tool assumes Autoconf 2.57 through 2.59, since it copies
> m4/onceonly_2_57.m4.

Does m4/onceonly_2_57.m4 break with autoconf-2.60? It produces smaller code,
by using some undocumented hooks of autoconf. (I had actually hoped to see
this implementation be moved to autoconf-2.60, rather than the less optimized
m4/onceonly.m4.)

> If we could assume Autoconf 2.60, we could remove the following files,
>
> modules/assert
> modules/extensions
> m4/assert.m4
> m4/d-ino.m4
> m4/extensions.m4
> m4/onceonly.m4
> m4/onceonly_2_57.m4
>
> and install something like the following patch

Yes, thanks for having moved all these to autoconf. However, I think it's wise
to wait a few months until autoconf-2.60 has stabilized before forcing everyone
to jump from 2.59 to it.

Bruno


diff -c -3 -r1.8 argp.m4
*** argp.m4     10 Dec 2005 21:37:44 -0000      1.8
--- argp.m4     20 Apr 2006 11:56:08 -0000
***************
*** 1,5 ****
! # argp.m4 serial 5
! dnl Copyright (C) 2003-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.
--- 1,5 ----
! # argp.m4 serial 6
! dnl Copyright (C) 2003-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.
***************
*** 43,53 ****
                     AC_MSG_RESULT(yes)],
                   [ AC_MSG_RESULT(no)] )
  
!   AC_CHECK_DECLS_ONCE(
!      [clearerr_unlocked feof_unlocked ferror_unlocked
!       fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
!       fread_unlocked fwrite_unlocked getc_unlocked
!       getchar_unlocked putc_unlocked putchar_unlocked])
    AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
    AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
  ])
--- 43,61 ----
                     AC_MSG_RESULT(yes)],
                   [ AC_MSG_RESULT(no)] )
  
!   AC_CHECK_DECLS_ONCE([clearerr_unlocked])
!   AC_CHECK_DECLS_ONCE([feof_unlocked])
!   AC_CHECK_DECLS_ONCE([ferror_unlocked])
!   AC_CHECK_DECLS_ONCE([fflush_unlocked])
!   AC_CHECK_DECLS_ONCE([fgets_unlocked])
!   AC_CHECK_DECLS_ONCE([fputc_unlocked])
!   AC_CHECK_DECLS_ONCE([fputs_unlocked])
!   AC_CHECK_DECLS_ONCE([fread_unlocked])
!   AC_CHECK_DECLS_ONCE([fwrite_unlocked])
!   AC_CHECK_DECLS_ONCE([getc_unlocked])
!   AC_CHECK_DECLS_ONCE([getchar_unlocked])
!   AC_CHECK_DECLS_ONCE([putc_unlocked])
!   AC_CHECK_DECLS_ONCE([putchar_unlocked])
    AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
    AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
  ])
diff -c -3 -r1.2 getlogin_r.m4
*** getlogin_r.m4       4 Sep 2005 00:05:33 -0000       1.2
--- getlogin_r.m4       20 Apr 2006 11:56:08 -0000
***************
*** 1,6 ****
! #serial 1
  
! # Copyright (C) 2005 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
--- 1,6 ----
! #serial 2
  
! # Copyright (C) 2005-2006 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
***************
*** 29,33 ****
  AC_DEFUN([gl_PREREQ_GETLOGIN_R],
  [
    AC_CHECK_HEADERS_ONCE([unistd.h])
!   AC_CHECK_DECLS_ONCE([getlogin getlogin_r])
  ])
--- 29,34 ----
  AC_DEFUN([gl_PREREQ_GETLOGIN_R],
  [
    AC_CHECK_HEADERS_ONCE([unistd.h])
!   AC_CHECK_DECLS_ONCE([getlogin])
!   AC_CHECK_DECLS_ONCE([getlogin_r])
  ])
diff -c -3 -r1.11 getpass.m4
*** getpass.m4  25 Aug 2005 21:19:07 -0000      1.11
--- getpass.m4  20 Apr 2006 11:56:08 -0000
***************
*** 1,5 ****
! # getpass.m4 serial 6
! dnl Copyright (C) 2002-2003, 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.
--- 1,5 ----
! # getpass.m4 serial 7
! 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,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 37,41 ****
  AC_DEFUN([gl_PREREQ_GETPASS], [
    AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h)
    AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr)
!   AC_CHECK_DECLS_ONCE([fflush_unlocked flockfile fputs_unlocked funlockfile 
putc_unlocked])
  ])
--- 37,45 ----
  AC_DEFUN([gl_PREREQ_GETPASS], [
    AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h)
    AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr)
!   AC_CHECK_DECLS_ONCE([fflush_unlocked])
!   AC_CHECK_DECLS_ONCE([flockfile])
!   AC_CHECK_DECLS_ONCE([fputs_unlocked])
!   AC_CHECK_DECLS_ONCE([funlockfile])
!   AC_CHECK_DECLS_ONCE([putc_unlocked])
  ])
diff -c -3 -r1.6 unlocked-io.m4
*** unlocked-io.m4      21 Mar 2005 22:06:27 -0000      1.6
--- unlocked-io.m4      20 Apr 2006 11:56:08 -0000
***************
*** 1,6 ****
! # unlocked-io.m4 serial 12
  
! # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software
  # Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
--- 1,6 ----
! # unlocked-io.m4 serial 13
  
! # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free 
Software
  # Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
***************
*** 28,36 ****
    dnl fgets_unlocked(), fputs_unlocked() etc.
    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  
!   AC_CHECK_DECLS_ONCE(
!      [clearerr_unlocked feof_unlocked ferror_unlocked
!       fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
!       fread_unlocked fwrite_unlocked getc_unlocked
!       getchar_unlocked putc_unlocked putchar_unlocked])
  ])
--- 28,44 ----
    dnl fgets_unlocked(), fputs_unlocked() etc.
    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  
!   AC_CHECK_DECLS_ONCE([clearerr_unlocked])
!   AC_CHECK_DECLS_ONCE([feof_unlocked])
!   AC_CHECK_DECLS_ONCE([ferror_unlocked])
!   AC_CHECK_DECLS_ONCE([fflush_unlocked])
!   AC_CHECK_DECLS_ONCE([fgets_unlocked])
!   AC_CHECK_DECLS_ONCE([fputc_unlocked])
!   AC_CHECK_DECLS_ONCE([fputs_unlocked])
!   AC_CHECK_DECLS_ONCE([fread_unlocked])
!   AC_CHECK_DECLS_ONCE([fwrite_unlocked])
!   AC_CHECK_DECLS_ONCE([getc_unlocked])
!   AC_CHECK_DECLS_ONCE([getchar_unlocked])
!   AC_CHECK_DECLS_ONCE([putc_unlocked])
!   AC_CHECK_DECLS_ONCE([putchar_unlocked])
  ])