From: Bruno Haible <bruno@clisp.org>
Date: Mon, 28 Dec 2020 13:12:27 +0000 (+0100)
Subject: build: Remove glibc21.m4 (unused since 2018-09-17).
X-Git-Tag: v0.21.1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d76fb9aeef1b9e274cb04244ad0b028dc80c6845;p=thirdparty%2Fgettext.git

build: Remove glibc21.m4 (unused since 2018-09-17).

* gettext-runtime/m4/intl.m4 (AM_INTL_SUBDIR): Don't require gl_GLIBC21.
* gettext-tools/configure.ac: Don't invoke gl_GLIBC21.
* gettext-runtime/m4/glibc21.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 3a8c206b9..c184eb2a7 100644
--- a/gettext-runtime/m4/Makefile.am
+++ b/gettext-runtime/m4/Makefile.am
@@ -23,7 +23,6 @@ fcntl-o.m4 \
 flexmember.m4 \
 gettext.m4 \
 glibc2.m4 \
-glibc21.m4 \
 iconv.m4 \
 intdiv0.m4 \
 intl.m4 \
diff --git a/gettext-runtime/m4/glibc21.m4 b/gettext-runtime/m4/glibc21.m4
deleted file mode 100644
index 0ab0f235a..000000000
--- a/gettext-runtime/m4/glibc21.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-# glibc21.m4 serial 5
-dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2019 Free Software Foundation,
-dnl 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.
-
-# Test for the GNU C Library, version 2.1 or newer, or uClibc.
-# From Bruno Haible.
-
-AC_DEFUN([gl_GLIBC21],
-  [
-    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
-      [ac_cv_gnu_library_2_1],
-      [AC_EGREP_CPP([Lucky],
-        [
-#include <features.h>
-#ifdef __GNU_LIBRARY__
- #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
-  Lucky GNU user
- #endif
-#endif
-#ifdef __UCLIBC__
- Lucky user
-#endif
-        ],
-        [ac_cv_gnu_library_2_1=yes],
-        [ac_cv_gnu_library_2_1=no])
-      ]
-    )
-    AC_SUBST([GLIBC21])
-    GLIBC21="$ac_cv_gnu_library_2_1"
-  ]
-)
diff --git a/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 5e1cb5449..84a166f61 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 47 (gettext-0.21.1)
+# intl.m4 serial 48 (gettext-0.21.1)
 dnl Copyright (C) 1995-2014, 2016-2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,6 @@ AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([gt_TYPE_INTMAX_T])
   AC_REQUIRE([gt_PRINTF_POSIX])
-  AC_REQUIRE([gl_GLIBC21])dnl
   AC_REQUIRE([gl_XSIZE])dnl
   AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
 
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 387d148ec..d239398dd 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -230,7 +230,6 @@ AC_TYPE_SIZE_T
 AC_CHECK_TYPES([ptrdiff_t])
 gt_TYPE_SSIZE_T
 AC_TYPE_PID_T
-gl_GLIBC21
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS([select])