From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Jun 2023 09:43:49 +0000 (+0200)
Subject: build: Assume that <stdint.h> or <inttypes.h> defines uintmax_t.
X-Git-Tag: v0.23~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5beadec7bb4ac5bda85cc49f4663952693f55c9;p=thirdparty%2Fgettext.git

build: Assume that <stdint.h> or <inttypes.h> defines uintmax_t.

OpenBSD has it since OpenBSD 3.9 (2006).

* gettext-runtime/m4/intl.m4 (gt_INTL_SUBDIR_CORE): Don't invoke
gl_AC_TYPE_UINTMAX_T.
* gettext-runtime/m4/uintmax_t.m4: Remove file.
* gettext-runtime/m4/Makefile.am (EXTRA_DIST): Remove it.
---

diff --git a/gettext-runtime/m4/Makefile.am b/gettext-runtime/m4/Makefile.am
index e58bd5e7e..362b7a635 100644
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -30,5 +30,4 @@ inttypes_h.m4 \
 nls.m4 \
 po.m4 \
 progtest.m4 \
-stdint_h.m4 \
-uintmax_t.m4
+stdint_h.m4
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index cb1657794..cae6a2190 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 53 (gettext-0.22)
+# intl.m4 serial 54 (gettext-0.23)
 dnl Copyright (C) 1995-2014, 2016-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -44,7 +44,6 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
   AC_REQUIRE([AC_FUNC_MMAP])dnl
   AC_REQUIRE([gt_INTDIV0])dnl
-  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
   AC_REQUIRE([gl_LOCK])dnl
 
   AC_LINK_IFELSE(
diff --git a/gettext-runtime/m4/uintmax_t.m4 b/gettext-runtime/m4/uintmax_t.m4
deleted file mode 100644
index 2926bea94..000000000
--- a/gettext-runtime/m4/uintmax_t.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-# uintmax_t.m4 serial 12
-dnl Copyright (C) 1997-2004, 2007-2019 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.
-
-dnl From Paul Eggert.
-
-AC_PREREQ([2.13])
-
-# Define uintmax_t to 'unsigned long' or 'unsigned long long'
-# if it is not already defined in <stdint.h> or <inttypes.h>.
-
-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
-[
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
-    AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-    test $ac_cv_type_unsigned_long_long_int = yes \
-      && 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 <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
-])