diff options
| author | Eric Blake <ebb9@byu.net> | 2009-01-21 10:55:43 -0700 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2009-01-21 10:55:43 -0700 |
| commit | 8a737519436884006a412fbf28cc76f35cedcd2f (patch) | |
| tree | 6f337240db291d02c9eaabec2898ed6afc0a3f63 /m4/multiarch.m4 | |
| parent | 9f2c2152d14031f8d4757647ca7c9d8d0f64b095 (diff) | |
| download | gnulib-8a737519436884006a412fbf28cc76f35cedcd2f.tar.gz | |
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>
Diffstat (limited to 'm4/multiarch.m4')
| -rw-r--r-- | m4/multiarch.m4 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 7b73e15ee9..3948e6e0db 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 |