Re: canonicalize: remove redundant macro definitions

[Bruno Haible]

> 2007-01-01  Bruno Haible  <address@hidden>
> 
>       * m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME): Remove
>       PROVIDE_CANONICALIZE_FILENAME_MODE macro definition.
>       * lib/canonicalize.h: Test GNULIB_CANONICALIZE instead of
>       PROVIDE_CANONICALIZE_FILENAME_MODE.

I applied this instead:

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

        * m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME): Remove
        PROVIDE_CANONICALIZE_FILENAME_MODE macro definition.
        * lib/canonicalize.h: Test GNULIB_CANONICALIZE instead of
        PROVIDE_CANONICALIZE_FILENAME_MODE.
        * modules/canonicalize (configure.ac): Use gl_MODULE_INDICATOR.

diff -c -3 -r1.5 canonicalize.h
*** lib/canonicalize.h  6 Nov 2006 18:21:35 -0000       1.5
--- lib/canonicalize.h  8 Jan 2007 21:30:16 -0000
***************
*** 1,5 ****
  /* Return the canonical absolute name of a given file.
!    Copyright (C) 1996-2006 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,5 ----
  /* Return the canonical absolute name of a given file.
!    Copyright (C) 1996-2007 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 19,25 ****
  #ifndef CANONICALIZE_H_
  # define CANONICALIZE_H_
  
! # ifdef PROVIDE_CANONICALIZE_FILENAME_MODE
  enum canonicalize_mode_t
    {
      /* All components must exist.  */
--- 19,25 ----
  #ifndef CANONICALIZE_H_
  # define CANONICALIZE_H_
  
! # if GNULIB_CANONICALIZE
  enum canonicalize_mode_t
    {
      /* All components must exist.  */
diff -c -3 -r1.8 canonicalize.m4
*** m4/canonicalize.m4  3 Nov 2006 23:17:27 -0000       1.8
--- m4/canonicalize.m4  8 Jan 2007 21:30:16 -0000
***************
*** 1,6 ****
! #serial 11
  
! # Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
--- 1,6 ----
! #serial 12
  
! # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
***************
*** 14,19 ****
      AC_CHECK_HEADERS_ONCE([sys/param.h])
      AC_CHECK_DECLS_ONCE([canonicalize_file_name])
      AC_CHECK_FUNCS_ONCE([canonicalize_file_name resolvepath])
-     AC_DEFINE([PROVIDE_CANONICALIZE_FILENAME_MODE], 1,
-       [Define to 1 to provide canonicalize_filename_mode.])
    ])
--- 14,17 ----
diff -c -3 -r1.12 canonicalize
*** modules/canonicalize        27 Oct 2006 20:46:43 -0000      1.12
--- modules/canonicalize        8 Jan 2007 21:30:16 -0000
***************
*** 17,22 ****
--- 17,23 ----
  
  configure.ac:
  AC_FUNC_CANONICALIZE_FILE_NAME
+ gl_MODULE_INDICATOR([canonicalize])
  
  Makefile.am: