diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-24 16:52:26 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-04-24 16:52:26 +0200 |
| commit | c140b280d2ce855161817b9a79cfe821b05312b8 (patch) | |
| tree | c552afcece5bcba779c17e80675b7a66e12837d6 /m4 | |
| parent | b2346264de7b3b73945a1a9a84af82f5bc2960d3 (diff) | |
| download | gnulib-c140b280d2ce855161817b9a79cfe821b05312b8.tar.gz | |
inttypes: Move some configure check to module 'imaxdiv'.
* m4/imaxdiv.m4 (gl_FUNC_IMAXDIV): Require gl_INTTYPES_H_DEFAULTS
instead of gl_INTTYPES_H. Check for imaxdiv decl here.
* m4/inttypes.m4 (gl_INTTYPES_H): Don't check for imaxdiv decl here.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/imaxdiv.m4 | 6 | ||||
| -rw-r--r-- | m4/inttypes.m4 | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/m4/imaxdiv.m4 b/m4/imaxdiv.m4 index b23f636c80..4939912c5a 100644 --- a/m4/imaxdiv.m4 +++ b/m4/imaxdiv.m4 @@ -1,4 +1,4 @@ -# imaxdiv.m4 serial 1 +# imaxdiv.m4 serial 2 dnl Copyright (C) 2006, 2009-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, @@ -6,8 +6,10 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_IMAXDIV], [ - AC_REQUIRE([gl_INTTYPES_H]) + AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) + AC_CHECK_DECLS_ONCE([imaxdiv]) if test "$ac_cv_have_decl_imaxdiv" != yes; then + HAVE_DECL_IMAXDIV=0 AC_LIBOBJ([imaxdiv]) gl_PREREQ_IMAXDIV fi diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 5cc042a704..1b76c691df 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,4 +1,4 @@ -# inttypes.m4 serial 20 +# inttypes.m4 serial 21 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, @@ -12,7 +12,6 @@ AC_DEFUN([gl_INTTYPES_H], AC_REQUIRE([gl_STDINT_H]) AC_REQUIRE([gt_INTTYPES_PRI]) AC_CHECK_HEADERS_ONCE([inttypes.h]) - AC_CHECK_DECLS_ONCE([imaxdiv]) AC_CHECK_DECLS_ONCE([strtoimax]) AC_CHECK_DECLS_ONCE([strtoumax]) @@ -61,12 +60,6 @@ AC_DEFUN([gl_INTTYPES_H], fi AC_SUBST([PRIPTR_PREFIX]) - if test "$ac_cv_have_decl_imaxdiv" = yes; then - HAVE_DECL_IMAXDIV=1 - else - HAVE_DECL_IMAXDIV=0 - fi - if test "$ac_cv_have_decl_strtoimax" = yes; then HAVE_DECL_STRTOIMAX=1 else |