bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

canonicalize: remove redundant macro definitions


From: Bruno Haible
Subject: canonicalize: remove redundant macro definitions
Date: Tue, 2 Jan 2007 22:00:21 +0100
User-agent: KMail/1.9.1

Hi Jim,

Now that gnulib-tool defines GNULIB_CANONICALIZE when the canonicalize module
is in use, the PROVIDE_CANONICALIZE_FILENAME_MODE macro is redundant. Here is
a proposed patch:

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.

*** lib/canonicalize.h.bak      2006-11-07 01:19:05.000000000 +0100
--- lib/canonicalize.h  2007-01-01 16:58:56.000000000 +0100
***************
*** 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.  */
*** m4/canonicalize.m4.bak      2006-11-07 01:19:06.000000000 +0100
--- m4/canonicalize.m4  2007-01-01 16:59:17.000000000 +0100
***************
*** 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 ----




reply via email to

[Prev in Thread] Current Thread [Next in Thread]