From: Jim Meyering <meyering@redhat.com>
Date: Mon, 16 Nov 2009 18:26:35 +0000 (+0100)
Subject: better AC_REQUIRE expanded-before-required-warning avoidance
X-Git-Tag: v0.1~5189
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=69637233ce151566c1a861bce77e1ca32305638e;hp=9126c7225c043e59b8496fdfe81a533cebe0bfd1;p=gnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index de93143ab..259f983bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-16  Jim Meyering  <meyering@redhat.com>
+
+	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  Eric Blake  <ebb9@byu.net>
 
 	test-freading: clean up temporary file
diff --git a/m4/chown.m4 b/m4/chown.m4
index 983dde8dd..5bedfa192 100644
--- a/m4/chown.m4
+++ b/m4/chown.m4
@@ -1,4 +1,4 @@
-# serial 20
+# 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])
@@ -63,7 +63,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 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])