From: Eric Blake Date: Mon, 16 May 2011 23:20:47 +0000 (-0600) Subject: inttypes: avoid autoconf warning X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bbe9dc2cbafbfa8e9e31de835d8eec23ea54aa1;p=pspp inttypes: avoid autoconf warning 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 --- diff --git a/ChangeLog b/ChangeLog index ac9a16529c..a418adfac9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-16 Eric Blake + + 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 and Eric Blake diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 1e81990bda..cc027a417f 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 dff37fe1bf..c75e95722a 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 is supported or must be substituted. -AC_DEFUN([gl_STDINT_H], +AC_DEFUN_ONCE([gl_STDINT_H], [ AC_PREREQ([2.59])dnl