From 456348e9bfe3d4bf89997d87e8d17f74dab03adb Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Mon, 16 Nov 2009 19:26:35 +0100 Subject: [PATCH] better AC_REQUIRE expanded-before-required-warning avoidance * m4/chown.m4 (gl_FUNC_CHOWN, gl_FUNC_CHOWN_FOLLOWS_SYMLINK): Define with AC_DEFUN_ONCE, rather than AC_DEFUN, to avoid AC_REQUIRE warnings. Suggested by Eric Blake. This change also reverts commit 1b712ba8, which is no longer needed. --- ChangeLog | 8 ++++++++ m4/chown.m4 | 6 +++--- modules/chown | 2 +- modules/euidaccess | 2 +- modules/faccessat | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fc79f384..4d957d7fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-11-16 Jim Meyering + better AC_REQUIRE expanded-before-required-warning avoidance + * m4/chown.m4 (gl_FUNC_CHOWN, gl_FUNC_CHOWN_FOLLOWS_SYMLINK): Define + with AC_DEFUN_ONCE, rather than AC_DEFUN, to avoid AC_REQUIRE warnings. + Suggested by Eric Blake. This change also reverts commit 1b712ba8, + which is no longer needed. + +2009-11-16 Jim Meyering + avoid new AC_REQUIRE expanded-before-required warnings * modules/chown (configure.ac): Require gl_FUNC_CHOWN, rather than merely using it. diff --git a/m4/chown.m4 b/m4/chown.m4 index ac76d3fe2..d6134ca2d 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,4 +1,4 @@ -# serial 19 +# serial 21 # Determine whether we need the chown wrapper. dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009 @@ -14,7 +14,7 @@ dnl with or without modifications, as long as this notice is preserved. # From Jim Meyering. -AC_DEFUN([gl_FUNC_CHOWN], +AC_DEFUN_ONCE([gl_FUNC_CHOWN], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([AC_TYPE_UID_T]) @@ -38,7 +38,7 @@ AC_DEFUN([gl_FUNC_CHOWN], ]) # Determine whether chown follows symlinks (it should). -AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], +AC_DEFUN_ONCE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], [ AC_CACHE_CHECK( [whether chown(2) dereferences symlinks], diff --git a/modules/chown b/modules/chown index 57331c391..88d0cd458 100644 --- a/modules/chown +++ b/modules/chown @@ -13,7 +13,7 @@ stat sys_stat configure.ac: -AC_REQUIRE([gl_FUNC_CHOWN]) +gl_FUNC_CHOWN gl_UNISTD_MODULE_INDICATOR([chown]) Makefile.am: diff --git a/modules/euidaccess b/modules/euidaccess index c313da34f..bf329c64d 100644 --- a/modules/euidaccess +++ b/modules/euidaccess @@ -13,7 +13,7 @@ stat sys_stat configure.ac: -AC_REQUIRE([gl_FUNC_EUIDACCESS]) +gl_FUNC_EUIDACCESS gl_UNISTD_MODULE_INDICATOR([euidaccess]) Makefile.am: diff --git a/modules/faccessat b/modules/faccessat index 57f9497d7..92d818556 100644 --- a/modules/faccessat +++ b/modules/faccessat @@ -13,7 +13,7 @@ openat unistd configure.ac: -AC_REQUIRE([gl_FUNC_FACCESSAT]) +gl_FUNC_FACCESSAT gl_MODULE_INDICATOR([faccessat]) gl_UNISTD_MODULE_INDICATOR([faccessat]) -- 2.11.0