diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 02:31:24 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-22 02:31:24 -0700 |
| commit | 03eb7af5765b8921f1724813908ae823ff35baaa (patch) | |
| tree | bfc0d8b230fb8a75882cd450f7f1d6953255305b /m4 | |
| parent | c1e127f9f0431e1b7f6ebb705988bfd03ec450a7 (diff) | |
| download | emacs-03eb7af5765b8921f1724813908ae823ff35baaa.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/inttypes.m4 | 3 | ||||
| -rw-r--r-- | m4/strtoumax.m4 | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 46a00c6d7aa..920f72db755 100644 --- 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. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index d69c1f79c79..f8075945a3c 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -32,6 +32,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], # Prerequisites of lib/strtoumax.c. AC_DEFUN([gl_PREREQ_STRTOUMAX], [ + AC_CHECK_DECLS([strtoull]) AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) gl_FUNC_STRTOULL ]) |