Mercurial > hg > octave-lojdl > gnulib-hg
changeset 11067:f5a88114d90a
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 <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Wed, 21 Jan 2009 10:55:43 -0700 |
| parents | e6215ba96121 |
| children | 46ff2eeb7a64 |
| files | ChangeLog m4/multiarch.m4 modules/multiarch |
| diffstat | 3 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2009-01-21 Eric Blake <ebb9@byu.net> + 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.
--- 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 @@ # 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