# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1232559204 25200
# Node ID e6215ba96121656905855ac9d596ae9e6a3ef114
# Parent  d07b536d92a95d97437898440d2b1bf7897cfa14
error: avoid expand-before-require warning

* modules/errno (configure.ac): Require, rather than expand,
gl_HEADER_ERRNO_H.
* m4/errno_h.m4 (gl_HEADER_ERRNO_H_BODY): Merge...
(gl_HEADER_ERRNO_H): ...into this macro, and use AC_DEFUN_ONCE to
enforce that all clients require it.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-01-21  Eric Blake  <ebb9@byu.net>
 
+	error: avoid expand-before-require warning
+	* modules/errno (configure.ac): Require, rather than expand,
+	gl_HEADER_ERRNO_H.
+	* m4/errno_h.m4 (gl_HEADER_ERRNO_H_BODY): Merge...
+	(gl_HEADER_ERRNO_H): ...into this macro, and use AC_DEFUN_ONCE to
+	enforce that all clients require it.
+
 	gnulib-tool: avoid warnings from using obsolete AC_GNU_SOURCE
 	* gnulib-tool (func_dest_tmpfilename, func_create_testdir): Using
 	obsolete AC_GNU_SOURCE causes out-of-order expansion; avoid it,
diff --git a/m4/errno_h.m4 b/m4/errno_h.m4
--- a/m4/errno_h.m4
+++ b/m4/errno_h.m4
@@ -1,17 +1,11 @@
-# errno_h.m4 serial 3
+# errno_h.m4 serial 4
 dnl Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_HEADER_ERRNO_H],
-[
-  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
-  dnl once only, before all statements that occur in other macros.
-  AC_REQUIRE([gl_HEADER_ERRNO_H_BODY])
-])
-
-AC_DEFUN([gl_HEADER_ERRNO_H_BODY],
+dnl This macro must pass through AC_REQUIRE (never directly invoke it).
+AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
diff --git a/modules/errno b/modules/errno
--- a/modules/errno
+++ b/modules/errno
@@ -9,7 +9,7 @@
 include_next
 
 configure.ac:
-gl_HEADER_ERRNO_H
+AC_REQUIRE([gl_HEADER_ERRNO_H])
 
 Makefile.am:
 BUILT_SOURCES += $(ERRNO_H)