From 93d45a6cea3e8c0959a430e0b3f5ae24fc600399 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 8 Jan 2007 21:31:56 +0000 Subject: [PATCH] 2007-01-08 Bruno Haible * 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. --- ChangeLog | 8 ++++++++ lib/canonicalize.h | 4 ++-- m4/canonicalize.m4 | 6 ++---- modules/canonicalize | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa28c08d22..5581a567fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-08 Bruno Haible + + * 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. + 2007-01-08 Bruno Haible * m4/fts.m4 (gl_FUNC_FTS_LGPL): Remove _LGPL_PACKAGE macro definition. diff --git a/lib/canonicalize.h b/lib/canonicalize.h index 8821a768e1..5c4d3f1a5e 100644 --- a/lib/canonicalize.h +++ b/lib/canonicalize.h @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2006 Free Software Foundation, Inc. + 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,7 +19,7 @@ #ifndef CANONICALIZE_H_ # define CANONICALIZE_H_ -# ifdef PROVIDE_CANONICALIZE_FILENAME_MODE +# if GNULIB_CANONICALIZE enum canonicalize_mode_t { /* All components must exist. */ diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index b488bb5606..817edd5804 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ -#serial 11 +#serial 12 -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 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,6 +14,4 @@ AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME], 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.]) ]) diff --git a/modules/canonicalize b/modules/canonicalize index 9f1bd2191a..4275f32c6f 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -17,6 +17,7 @@ xreadlink configure.ac: AC_FUNC_CANONICALIZE_FILE_NAME +gl_MODULE_INDICATOR([canonicalize]) Makefile.am: -- 2.30.2