From 8a737519436884006a412fbf28cc76f35cedcd2f Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 21 Jan 2009 10:55:43 -0700 Subject: [PATCH] multiarch: avoid expand-before-require warning * modules/multiarch (configure.ac): Require, rather than expand, gl_MULTIARCH. * m4/multiarch.m4 (gl_MULTIARCH_BODY): Merge... (gl_MULTIARCH): ...into this macro, and use AC_DEFUN_ONCE to enforce that all clients require it. Partial reversion of 2008-12-29 patch. Signed-off-by: Eric Blake --- ChangeLog | 8 ++++++++ m4/multiarch.m4 | 16 ++++------------ modules/multiarch | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc8fc9fac..168fbc296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-01-21 Eric Blake + multiarch: avoid expand-before-require warning + * modules/multiarch (configure.ac): Require, rather than expand, + gl_MULTIARCH. + * m4/multiarch.m4 (gl_MULTIARCH_BODY): Merge... + (gl_MULTIARCH): ...into this macro, and use AC_DEFUN_ONCE to + enforce that all clients require it. Partial reversion of + 2008-12-29 patch. + error: avoid expand-before-require warning * modules/errno (configure.ac): Require, rather than expand, gl_HEADER_ERRNO_H. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 7b73e15ee..3948e6e0d 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ -# multiarch.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# multiarch.m4 serial 4 +dnl Copyright (C) 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. @@ -19,16 +19,8 @@ dnl with or without modifications, as long as this notice is preserved. # Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the # beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. -AC_DEFUN([gl_MULTIARCH], -[ - dnl This AC_REQUIRE is not necessary in theory. It works around a bug in - dnl autoconf <= 2.63: AC_REQUIRE invocations inside AC_REQUIREd macros are - dnl being handled better than AC_REQUIRE invocations inside normally invoked - dnl macros. - AC_REQUIRE([gl_MULTIARCH_BODY]) -]) - -AC_DEFUN([gl_MULTIARCH_BODY], +dnl This macro must pass through AC_REQUIRE (never directly invoke it). +AC_DEFUN_ONCE([gl_MULTIARCH], [ dnl Code similar to autoconf-2.63 AC_C_BIGENDIAN. gl_cv_c_multiarch=no diff --git a/modules/multiarch b/modules/multiarch index 24b14d522..82d67a4c6 100644 --- a/modules/multiarch +++ b/modules/multiarch @@ -7,7 +7,7 @@ m4/multiarch.m4 Depends-on: configure.ac: -gl_MULTIARCH +AC_REQUIRE([gl_MULTIARCH]) Makefile.am: -- 2.11.0