[PATCH] inttypes: avoid autoconf warning

[Eric Blake]

I noticed this while updating libvirt to the latest gnulib.

configure.ac:80: warning: AC_REQUIRE: `gl_STDINT_H' was expanded before it was 
required
gnulib/m4/inttypes.m4:18: gl_INTTYPES_INCOMPLETE is expanded from...
gnulib/m4/inttypes.m4:12: gl_INTTYPES_H is expanded from...
gnulib/m4/gnulib-comp.m4:379: gl_INIT is expanded from...
configure.ac:80: the top level

* m4/inttypes.m4 (gl_INTTYPES_INCOMPLETE): Only expand once.
* m4/stdint.m4 (gl_STDINT_H): Likewise.

Signed-off-by: Eric Blake <address@hidden>
---

The interaction stems from the direct expansion in modules/stdint
vs. the AC_REQUIRE([gl_STDINT_H]) in inttypes.m4.  I'm not sure
what sequence of modules triggered this (that is, I could reproduce
it in libvirt, but not using ./gnulib-tool --with-tests in isolation),
but I did validate that this fixes it.  Besides, per the autoconf
manual, the easiest fix is to make the macros one-shot, after
verifying that they indeed only need to run once.

 ChangeLog      |    6 ++++++
 m4/inttypes.m4 |    4 ++--
 m4/stdint.m4   |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac9a165..a418adf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-16  Eric Blake  <address@hidden>
+
+       inttypes: avoid autoconf warning
+       * m4/inttypes.m4 (gl_INTTYPES_INCOMPLETE): Only expand once.
+       * m4/stdint.m4 (gl_STDINT_H): Likewise.
+
 2011-05-16  Sam Steingold <address@hidden>
        and Eric Blake  <address@hidden>

diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 1e81990..cc027a4 100644
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 23
+# inttypes.m4 serial 24
 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_INTTYPES_H],
   gl_INTTYPES_PRI_SCN
 ])

-AC_DEFUN([gl_INTTYPES_INCOMPLETE],
+AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
 [
   AC_REQUIRE([gl_STDINT_H])
   AC_CHECK_HEADERS_ONCE([inttypes.h])
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index dff37fe..c75e957 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 40
+# stdint.m4 serial 41
 dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is 
preserved.
 dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.

-AC_DEFUN([gl_STDINT_H],
+AC_DEFUN_ONCE([gl_STDINT_H],
 [
   AC_PREREQ([2.59])dnl

-- 
1.7.4.4