Ensure intmax_t gets defined in libasprintf.

7 files changed, 22 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ae10a9dd2..361cd2bf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-04  Bruno Haible  <bruno@clisp.org>
+
+	Ensure intmax_t gets defined in libasprintf.
+	* autogen.sh: Create gettext-runtime/m4/intmax_t.m4, copied from
+	gnulib.
+	* Makefile.am (distcheck-hook): Check also intmax_t.m4.
+
 2011-06-03  Bruno Haible  <bruno@clisp.org>
 
 	* autogen.sh (GNULIB_MODULES_LIBASPRINTF): Add verify.
diff --git a/Makefile.am b/Makefile.am
index cc9b18395..d555020ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ distcheck-hook:
 	cmp -s gettext-runtime/m4/intldir.m4 gettext-tools/gnulib-m4/intldir.m4
 	cmp -s gettext-runtime/m4/intlmacosx.m4 gettext-tools/gnulib-m4/intlmacosx.m4
 	cmp -s gettext-runtime/m4/intmax.m4 gettext-tools/gnulib-m4/intmax.m4
+	cmp -s gettext-runtime/m4/intmax_t.m4 gettext-tools/gnulib-m4/intmax_t.m4
 	cmp -s gettext-runtime/m4/inttypes-pri.m4 gettext-tools/gnulib-m4/inttypes-pri.m4
 	cmp -s gettext-runtime/m4/inttypes_h.m4 gettext-tools/gnulib-m4/inttypes_h.m4
 	cmp -s gettext-runtime/m4/lcmessage.m4 gettext-tools/gnulib-m4/lcmessage.m4
diff --git a/autogen.sh b/autogen.sh
index 60131871c..48aa5bcd6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -113,6 +113,7 @@ if ! $skip_gnulib; then
     '
     $GNULIB_TOOL --dir=gettext-runtime/libasprintf --source-base=. --m4-base=gnulib-m4 --lgpl=2 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
       --import $GNULIB_MODULES_LIBASPRINTF $GNULIB_MODULES_LIBASPRINTF_OTHER
+    $GNULIB_TOOL --copy-file m4/intmax_t.m4 gettext-runtime/m4/intmax_t.m4
     # In gettext-tools:
     GNULIB_MODULES_TOOLS_FOR_SRC='
       alloca-opt
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 7908646bb..066fcdb76 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-04  Bruno Haible  <bruno@clisp.org>
+
+	Ensure intmax_t gets defined in libasprintf.
+	* configure.ac: Invoke gl_AC_TYPE_INTMAX_T instead of gt_TYPE_INTMAX_T.
+
 2011-06-03  Bruno Haible  <bruno@clisp.org>
 
 	* Makefile.am (lib_asprintf_EXTRASOURCES): Add verify.h.
diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index 3735cd671..1e0aa4aad 100644
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the GNU libasprintf library
-dnl Copyright (C) 2002-2010 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ AC_CHECK_TYPE([ptrdiff_t], ,
   [AC_DEFINE([ptrdiff_t], [long],
      [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
   ])
-gt_TYPE_INTMAX_T
+gl_AC_TYPE_INTMAX_T
 gl_XSIZE
 
 dnl Checks for library functions.
diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog
index b3048739f..7267059db 100644
--- a/gettext-runtime/m4/ChangeLog
+++ b/gettext-runtime/m4/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-04  Bruno Haible  <bruno@clisp.org>
+
+	Ensure intmax_t gets defined in libasprintf.
+	* Makefile.am (EXTRA_DIST): Add intmax_t.m4.
+
 2011-02-18  Eric Blake  <eblake@redhat.com>
 
 	longlong: skip, rather than fail, on cross-compilation
diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index bf10c67b2..1e179777b 100644
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -14,6 +14,7 @@ intl.m4 \
 intldir.m4 \
 intlmacosx.m4 \
 intmax.m4 \
+intmax_t.m4 \
 inttypes-pri.m4 \
 inttypes_h.m4 \
 lcmessage.m4 \