From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Apr 2011 14:52:26 +0000 (+0200)
Subject: inttypes: Move some configure check to module 'imaxdiv'.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c140b280d2ce855161817b9a79cfe821b05312b8;p=pspp

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 6d23f709d2..8abcf2d513 100644
--- 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 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