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.

diff --git a/ChangeLog b/ChangeLog
index 6d23f709d251a4be3bd34f4b87281b6517cb0743..8abcf2d51324bb26bd499348b82243c935cdaee6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       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.
+
 2011-04-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        inttypes: Move some configure check to module 'imaxabs'.

diff --git a/m4/imaxdiv.m4 b/m4/imaxdiv.m4
index b23f636c80baa2a712df3a70436094b30110b452..4939912c5a69d474b174891087efeb3822b929c1 100644 (file)
--- 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 5cc042a7041a241120c784f650d2357004a8c2b4..1b76c691df7d1674c27a5783818f46059e8d6ba4 100644 (file)
--- 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