Imported Upstream version 1.22

[tar] / m4 / inttypes.m4

diff --git a/m4/inttypes.m4 b/m4/inttypes.m4
index d84ceadd58c98dae5ad588deb9fa9a461f31a263..8b4e4f852a24ad895d022b06b1cfb043c6531058 100644 (file)
--- a/m4/inttypes.m4
+++ b/m4/inttypes.m4
@@ -1,5 +1,5 @@
-# inttypes.m4 serial 12
-dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# inttypes.m4 serial 14
+dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -144,13 +144,15 @@ const char *l = /* implicit string concatenation */
     AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
     gl_CHECK_NEXT_HEADERS([inttypes.h])
 
+    AC_REQUIRE([gl_MULTIARCH])
+
     dnl Ensure that <stdint.h> defines the limit macros, since gnulib's
     dnl <inttypes.h> relies on them.  This macro is only needed when a
     dnl C++ compiler is in use; it has no effect for a C compiler.
     dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's
     dnl <inttypes.h> is going to be created, and to avoid redefinition warnings
     dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS.
-    AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], 1,
+    AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1],
       [Define to make the limit macros in <stdint.h> visible.])
     AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ],
 [/* Ensure that <stdint.h> defines the limit macros, since gnulib's
@@ -212,25 +214,33 @@ const char *l = /* implicit string concatenation */
       [defined INT32_MAX && defined INTMAX_MAX],
       [INT32_MAX < INTMAX_MAX],
       [sizeof (int) < sizeof (long long int)])
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [INT64_MAX_EQ_LONG_MAX],
-      [defined INT64_MAX],
-      [INT64_MAX == LONG_MAX],
-      [sizeof (long long int) == sizeof (long int)])
+    if test $APPLE_UNIVERSAL_BUILD = 0; then
+      gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+        [INT64_MAX_EQ_LONG_MAX],
+        [defined INT64_MAX],
+        [INT64_MAX == LONG_MAX],
+        [sizeof (long long int) == sizeof (long int)])
+    else
+      INT64_MAX_EQ_LONG_MAX=-1
+    fi
     gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
       [UINT32_MAX_LT_UINTMAX_MAX],
       [defined UINT32_MAX && defined UINTMAX_MAX],
       [UINT32_MAX < UINTMAX_MAX],
       [sizeof (unsigned int) < sizeof (unsigned long long int)])
-    gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
-      [UINT64_MAX_EQ_ULONG_MAX],
-      [defined UINT64_MAX],
-      [UINT64_MAX == ULONG_MAX],
-      [sizeof (unsigned long long int) == sizeof (unsigned long int)])
+    if test $APPLE_UNIVERSAL_BUILD = 0; then
+      gl_INTTYPES_CHECK_LONG_LONG_INT_CONDITION(
+        [UINT64_MAX_EQ_ULONG_MAX],
+        [defined UINT64_MAX],
+        [UINT64_MAX == ULONG_MAX],
+        [sizeof (unsigned long long int) == sizeof (unsigned long int)])
+    else
+      UINT64_MAX_EQ_ULONG_MAX=-1
+    fi
 
     INTTYPES_H='inttypes.h'
   fi
-  AC_SUBST(INTTYPES_H)
+  AC_SUBST([INTTYPES_H])
 ])
 
 # Define the symbol $1 to be 1 if the condition is true, 0 otherwise.