Merge from gnulib.

[bpt/emacs.git] / m4 / inttypes.m4

diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 46a00c6..920f72d 100644 (file)
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -10,11 +10,14 @@ dnl Test whether <inttypes.h> is supported or must be substituted.
 AC_DEFUN([gl_INTTYPES_H],
 [
   AC_REQUIRE([gl_STDINT_H])
+  AC_CHECK_HEADERS_ONCE([inttypes.h])
 
   dnl Override <inttypes.h> always, so that the portability warnings work.
   AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
   gl_CHECK_NEXT_HEADERS([inttypes.h])
 
+  AC_REQUIRE([gl_MULTIARCH])
+
   dnl Ensure that <stdint.h> defines the limit macros, since gnulib's
   dnl <inttypes.h> relies on them.  This macro is only needed when a
   dnl C++ compiler is in use; it has no effect for a C compiler.