inttypes: Move some configure check to module 'imaxabs'.

* m4/imaxabs.m4 (gl_FUNC_IMAXABS): Require gl_INTTYPES_H_DEFAULTS
instead of gl_INTTYPES_H.  Check for imaxabs decl here.
* m4/inttypes.m4 (gl_INTTYPES_H): Don't check for imaxabs decl here.

diff --git a/ChangeLog b/ChangeLog
index c22150070920a335604dc9e8f725b4c962e76857..6d23f709d251a4be3bd34f4b87281b6517cb0743 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 'imaxabs'.
+       * m4/imaxabs.m4 (gl_FUNC_IMAXABS): Require gl_INTTYPES_H_DEFAULTS
+       instead of gl_INTTYPES_H.  Check for imaxabs decl here.
+       * m4/inttypes.m4 (gl_INTTYPES_H): Don't check for imaxabs decl here.
+
 2011-04-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        inttypes: Remove configure tests that are not needed since 2009-12-31.

diff --git a/m4/imaxabs.m4 b/m4/imaxabs.m4
index 535a26f141fb977b2b5943792d84e21b715ae7d5..2450353822b57398184fcfdff9faf3357e82c113 100644 (file)
--- a/m4/imaxabs.m4
+++ b/m4/imaxabs.m4
@@ -1,4 +1,4 @@
-# imaxabs.m4 serial 1
+# imaxabs.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_IMAXABS],
 [
-  AC_REQUIRE([gl_INTTYPES_H])
+  AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
+  AC_CHECK_DECLS_ONCE([imaxabs])
   if test "$ac_cv_have_decl_imaxabs" != yes; then
+    HAVE_DECL_IMAXABS=0
     AC_LIBOBJ([imaxabs])
     gl_PREREQ_IMAXABS
   fi

diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index 42120e72c61e401f0f9ed62e2e798ef9b73f1f49..5cc042a7041a241120c784f650d2357004a8c2b4 100644 (file)
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 19
+# inttypes.m4 serial 20
 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([imaxabs])
   AC_CHECK_DECLS_ONCE([imaxdiv])
   AC_CHECK_DECLS_ONCE([strtoimax])
   AC_CHECK_DECLS_ONCE([strtoumax])
@@ -62,12 +61,6 @@ AC_DEFUN([gl_INTTYPES_H],
   fi
   AC_SUBST([PRIPTR_PREFIX])
 
-  if test "$ac_cv_have_decl_imaxabs" = yes; then
-    HAVE_DECL_IMAXABS=1
-  else
-    HAVE_DECL_IMAXABS=0
-  fi
-
   if test "$ac_cv_have_decl_imaxdiv" = yes; then
     HAVE_DECL_IMAXDIV=1
   else