From: Bruno Haible <bruno@clisp.org>
Date: Tue, 14 Jan 2003 13:20:19 +0000 (+0000)
Subject: Minor changes.
X-Git-Tag: v0.12~1177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d459e0b6ed336ed4fbc14a3eaa4480aaadb5b48;p=thirdparty%2Fgettext.git

Minor changes.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 884e489f4..fb70d33df 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -9,6 +9,15 @@
 	two PO directories.
 	Reported by Alexander Turbov <AVTurbov@gwise.eltech.ru>.
 
+2002-12-22  Bruno Haible  <bruno@clisp.org>
+
+	* inttypes_h.m4 (jm_AC_HEADER_INTTYPES_H): Whitespace change, takes
+	advantage of autoconf >= 2.52.
+	* stdint_h.m4 (jm_AC_HEADER_STDINT_H): Likewise.
+	* uintmax_t.m4 (jm_AC_TYPE_UINTMAX_T): Define HAVE_UINTMAX_T if
+	uintmax_t already exists. For consistency with HAVE_INTMAX_T, defined
+	by intmax.m4, needed by printf-parse.c.
+
 2002-12-07  Bruno Haible  <bruno@clisp.org>
 
 	Switch to autoconf-2.57 and automake-1.7.2.
diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4
index 400a11184..4de409e1e 100644
--- a/m4/inttypes_h.m4
+++ b/m4/inttypes_h.m4
@@ -1,4 +1,4 @@
-# inttypes_h.m4 serial 4 (gettext-0.11.4)
+# inttypes_h.m4 serial 5 (gettext-0.11.6)
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -22,7 +22,7 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
     jm_ac_cv_header_inttypes_h=no)])
   if test $jm_ac_cv_header_inttypes_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
   fi
 ])
diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4
index 4b5a4ac60..084b15747 100644
--- a/m4/stdint_h.m4
+++ b/m4/stdint_h.m4
@@ -1,4 +1,4 @@
-# stdint_h.m4 serial 2 (gettext-0.11.4)
+# stdint_h.m4 serial 3 (gettext-0.11.6)
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -22,7 +22,7 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H],
     jm_ac_cv_header_stdint_h=no)])
   if test $jm_ac_cv_header_stdint_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
-   and declares uintmax_t. ])
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
   fi
 ])
diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4
index ec3a8b922..cbae572b7 100644
--- a/m4/uintmax_t.m4
+++ b/m4/uintmax_t.m4
@@ -1,4 +1,4 @@
-# uintmax_t.m4 serial 6 (gettext-0.11)
+# uintmax_t.m4 serial 7 (gettext-0.11.6)
 dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -10,8 +10,8 @@ dnl From Paul Eggert.
 
 AC_PREREQ(2.13)
 
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist.
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
 
 AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
 [
@@ -23,7 +23,10 @@ AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'
     AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
-  [Define to unsigned long or unsigned long long
-   if <inttypes.h> and <stdint.h> don't define.])
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
   fi
 ])