Fix some type detection issues

2 files changed, 56 insertions, 11 deletions

diff --git a/config/open-axiom.m4 b/config/open-axiom.m4
index 98b62858..00a222a2 100644
--- a/config/open-axiom.m4
+++ b/config/open-axiom.m4
@@ -6,16 +6,18 @@ dnl -- OPENAXIOM_STANDARD_INTEGER_TYPES --
 dnl --------------------------------------
 dnl Check for availability of standard sized integer types.
 AC_DEFUN([OPENAXIOM_STANDARD_INTEGER_TYPES], [
-AC_TYPE_INT8_T
-AC_TYPE_UINT8_T
-AC_TYPE_INT16_T
-AC_TYPE_UINT16_T
-AC_TYPE_INT32_T
-AC_TYPE_UINT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT64_T
-AC_TYPE_INTPTR_T
-AC_TYPE_UINTPTR_T
+AC_CHECK_TYPES([int8_t],[],[AC_TYPE_INT8_T])
+AC_CHECK_TYPES([uint8_t],[],[AC_TYPE_UINT8_T])
+AC_CHECK_TYPES([int16_t],[],[AC_TYPE_INT16_T])
+AC_CHECK_TYPES([uint16_t],[][AC_TYPE_UINT16_T])
+AC_CHECK_TYPES([int32_t],[],[AC_TYPE_INT32_T])
+AC_CHECK_TYPES([uint32_t],[],[AC_TYPE_UINT32_T])
+AC_CHECK_TYPES([int64_t],[],[AC_TYPE_INT64_T])
+AC_CHECK_TYPES([uint64_t],[],[AC_TYPE_UINT64_T])
+AC_CHECK_TYPES([intptr_t],[],[AC_TYPE_INTPTR_T])
+AC_CHECK_TYPES([uintptr_t],[],[AC_TYPE_UINTPTR_T])
+AC_CHECK_TYPES([intmax_t],[],[AC_TYPE_INTMAX_T])
+AC_CHECK_TYPES([uintmax_t],[],[AC_TYPE_UINTMAX_T])
 ])
 
 
@@ -464,7 +466,6 @@ dnl ------------------------------------
 AC_DEFUN([OPENAXIOM_HOST_DATA_PROPERTIES],[
 ## Byte order of the host.
 AC_C_BIGENDIAN
-AC_CHECK_HEADERS([stdint.h inttypes.h])
 OPENAXIOM_STANDARD_INTEGER_TYPES
 AC_CHECK_SIZEOF([void*])
 if test x"$oa_include_gcl" = xyes; then
diff --git a/config/openaxiom-c-macros.h.in b/config/openaxiom-c-macros.h.in
index 14df3933..614c8fcc 100644
--- a/config/openaxiom-c-macros.h.in
+++ b/config/openaxiom-c-macros.h.in
@@ -54,6 +54,21 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
+/* Define to 1 if the system has the type `int16_t'. */
+#undef HAVE_INT16_T
+
+/* Define to 1 if the system has the type `int32_t'. */
+#undef HAVE_INT32_T
+
+/* Define to 1 if the system has the type `int64_t'. */
+#undef HAVE_INT64_T
+
+/* Define to 1 if the system has the type `int8_t'. */
+#undef HAVE_INT8_T
+
+/* Define to 1 if the system has the type `intmax_t'. */
+#undef HAVE_INTMAX_T
+
 /* Define to 1 if the system has the type `intptr_t'. */
 #undef HAVE_INTPTR_T
 
@@ -66,6 +81,9 @@
 /* Define to 1 if you support file names longer than 14 characters. */
 #undef HAVE_LONG_FILE_NAMES
 
+/* Define to 1 if the system has the type `long long int'. */
+#undef HAVE_LONG_LONG_INT
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -108,12 +126,30 @@
 /* Define to 1 if you have the <termios.h> header file. */
 #undef HAVE_TERMIOS_H
 
+/* Define to 1 if the system has the type `uint16_t'. */
+#undef HAVE_UINT16_T
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#undef HAVE_UINT32_T
+
+/* Define to 1 if the system has the type `uint64_t'. */
+#undef HAVE_UINT64_T
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#undef HAVE_UINT8_T
+
+/* Define to 1 if the system has the type `uintmax_t'. */
+#undef HAVE_UINTMAX_T
+
 /* Define to 1 if the system has the type `uintptr_t'. */
 #undef HAVE_UINTPTR_T
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if the system has the type `unsigned long long int'. */
+#undef HAVE_UNSIGNED_LONG_LONG_INT
+
 /* Define to 1 if you have the <util.h> header file. */
 #undef HAVE_UTIL_H
 
@@ -221,6 +257,10 @@
    a type exists and the standard includes do not define it. */
 #undef int8_t
 
+/* Define to the widest signed integer type if <stdint.h> and <inttypes.h> do
+   not define. */
+#undef intmax_t
+
 /* Define to the type of a signed integer type wide enough to hold a pointer,
    if such a type exists, and if the system does not define it. */
 #undef intptr_t
@@ -244,6 +284,10 @@
    such a type exists and the standard includes do not define it. */
 #undef uint8_t
 
+/* Define to the widest unsigned integer type if <stdint.h> and <inttypes.h>
+   do not define. */
+#undef uintmax_t
+
 /* Define to the type of an unsigned integer type wide enough to hold a
    pointer, if such a type exists, and if the system does not define it. */
 #undef uintptr_t