From: Akim Demaille <akim@epita.fr>
Date: Sat, 23 Jun 2001 15:18:46 +0000 (+0000)
Subject: * acgeneral.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS): Consider
X-Git-Tag: AUTOCONF-2.50a~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa614be7c3123823f2ef684f92bead92c10d78de;p=thirdparty%2Fautoconf.git

* acgeneral.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS): Consider
inttypes.h is missing if it conflicts with sys/types.h, as on IRIX
5.3.
---

diff --git a/ChangeLog b/ChangeLog
index ba95e9425..46e0c1afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-23  Akim Demaille  <akim@epita.fr>
+
+	* acgeneral.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS): Consider
+	inttypes.h is missing if it conflicts with sys/types.h, as on IRIX
+	5.3.
+
 2001-06-23  Paolo Bonzini <bonzini@gnu.org>
 
 	* acgeneral.m4 (_AC_OUTPUT_CONFIG_STATUS): Defer parsing of
diff --git a/NEWS b/NEWS
index a1c66ae15..4c931f416 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,8 @@
   likely.
 - `config.status foo' works properly when `foo' depends on variables
   set in an AC_CONFIG_THING INIT-CMD.
+- if inttypes.h and sys/types.h are conflicting, consider inttypes.h
+  doesn't exist.
 
 ** Generic macros
 - AC_CHECK_HEADER and AC_CHECK_HEADERS support a fourth argument to
diff --git a/acgeneral.m4 b/acgeneral.m4
index d12d9bf70..c82b96414 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -2235,9 +2235,16 @@ ac_includes_default="\
 #endif"
 ])dnl
 AC_REQUIRE([AC_HEADER_STDC])dnl
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                  inttypes.h stdint.h unistd.h],
+                  stdint.h unistd.h],
                  [], [], $ac_includes_default)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define HAVE_INTTYPES_H 1
+$ac_includes_default])],
+                  [ac_cv_header_inttypes_h=yes,
+AC_DEFINE([HAVE_INTTYPES_H], 1,
+          [Define if you have the <inttypes.h> header file.])],
+                  [ac_cv_header_inttypes_h=no])
 ])
 
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index d12d9bf70..c82b96414 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2235,9 +2235,16 @@ ac_includes_default="\
 #endif"
 ])dnl
 AC_REQUIRE([AC_HEADER_STDC])dnl
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-                  inttypes.h stdint.h unistd.h],
+                  stdint.h unistd.h],
                  [], [], $ac_includes_default)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define HAVE_INTTYPES_H 1
+$ac_includes_default])],
+                  [ac_cv_header_inttypes_h=yes,
+AC_DEFINE([HAVE_INTTYPES_H], 1,
+          [Define if you have the <inttypes.h> header file.])],
+                  [ac_cv_header_inttypes_h=no])
 ])