Re: remove redundant macro definitions

[Bruno Haible]

I applied this instead:

2007-01-08  Bruno Haible  <address@hidden>

        * m4/close-stream.m4 (gl_CLOSE_STREAM): Remove GNULIB_CLOSE_STREAM
        macro definition.
        * m4/fcntl-safer.m4 (gl_FCNTL_SAFER): Remove GNULIB_FCNTL_SAFER macro
        definition.
        * m4/stdio-safer.m4 (gl_FOPEN_SAFER): Remove GNULIB_FOPEN_SAFER macro
        definition.
        * modules/close-stream (configure.ac): Invoke gl_MODULE_INDICATOR.
        * modules/fcntl-safer (configure.ac): Likewise.
        * modules/fopen-safer (configure.ac): Likewise.
        * modules/fwriteerror (configure.ac): Likewise. Remove explicit
        GNULIB_FWRITEERROR macro definition.

diff -c -3 -r1.3 close-stream.m4
*** m4/close-stream.m4  6 Oct 2006 23:11:25 -0000       1.3
--- m4/close-stream.m4  8 Jan 2007 19:26:13 -0000
***************
*** 1,5 ****
! #serial 2
! 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,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! #serial 3
! dnl Copyright (C) 2006-2007 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.
***************
*** 7,14 ****
  AC_DEFUN([gl_CLOSE_STREAM],
  [
    AC_LIBOBJ([close-stream])
-   AC_DEFINE([GNULIB_CLOSE_STREAM], [1],
-     [Define to 1 when using the gnulib close-stream module.])
  
    dnl Prerequisites of lib/close-stream.c.
    :
--- 7,12 ----
diff -c -3 -r1.7 fcntl-safer.m4
*** m4/fcntl-safer.m4   6 Oct 2006 23:11:25 -0000       1.7
--- m4/fcntl-safer.m4   8 Jan 2007 19:26:13 -0000
***************
*** 1,5 ****
! #serial 4
! dnl Copyright (C) 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.
--- 1,5 ----
! #serial 5
! dnl Copyright (C) 2005-2007 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.
***************
*** 8,13 ****
  [
    AC_LIBOBJ([open-safer])
    AC_LIBOBJ([creat-safer])
-   AC_DEFINE([GNULIB_FCNTL_SAFER], [1],
-     [Define to 1 when using the gnulib fcntl-safer module.])
  ])
--- 8,11 ----
diff -c -3 -r1.10 stdio-safer.m4
*** m4/stdio-safer.m4   6 Oct 2006 23:11:25 -0000       1.10
--- m4/stdio-safer.m4   8 Jan 2007 19:26:14 -0000
***************
*** 1,5 ****
! #serial 9
! 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.
--- 1,5 ----
! #serial 10
! dnl Copyright (C) 2002, 2005-2007 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.
***************
*** 7,14 ****
  AC_DEFUN([gl_FOPEN_SAFER],
  [
    AC_LIBOBJ([fopen-safer])
-   AC_DEFINE([GNULIB_FOPEN_SAFER], [1],
-     [Define to 1 when using the gnulib fopen-safer module.])
  ])
  
  AC_DEFUN([gl_TMPFILE_SAFER],
--- 7,12 ----
diff -c -3 -r1.4 close-stream
*** modules/close-stream        13 Oct 2006 12:40:23 -0000      1.4
--- modules/close-stream        8 Jan 2007 19:26:14 -0000
***************
*** 12,17 ****
--- 12,18 ----
  
  configure.ac:
  gl_CLOSE_STREAM
+ gl_MODULE_INDICATOR([close-stream])
  
  Makefile.am:
  
diff -c -3 -r1.8 fcntl-safer
*** modules/fcntl-safer 13 Oct 2006 12:40:23 -0000      1.8
--- modules/fcntl-safer 8 Jan 2007 19:26:14 -0000
***************
*** 13,18 ****
--- 13,19 ----
  
  configure.ac:
  gl_FCNTL_SAFER
+ gl_MODULE_INDICATOR([fcntl-safer])
  
  Makefile.am:
  
diff -c -3 -r1.4 fopen-safer
*** modules/fopen-safer 13 Oct 2006 12:40:23 -0000      1.4
--- modules/fopen-safer 8 Jan 2007 19:26:14 -0000
***************
*** 12,17 ****
--- 12,18 ----
  
  configure.ac:
  gl_FOPEN_SAFER
+ gl_MODULE_INDICATOR([fopen-safer])
  
  Makefile.am:
  
diff -c -3 -r1.4 fwriteerror
*** modules/fwriteerror 6 Oct 2006 12:17:22 -0000       1.4
--- modules/fwriteerror 8 Jan 2007 19:26:14 -0000
***************
*** 9,16 ****
  stdbool
  
  configure.ac:
! AC_DEFINE([GNULIB_FWRITEERROR], 1,
!   [Define to 1 when using the gnulib fwriteerror module.])
  
  Makefile.am:
  lib_SOURCES += fwriteerror.h fwriteerror.c
--- 9,15 ----
  stdbool
  
  configure.ac:
! gl_MODULE_INDICATOR([fwriteerror])
  
  Makefile.am:
  lib_SOURCES += fwriteerror.h fwriteerror.c