summaryrefslogtreecommitdiff
path: root/gettext-runtime
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2020-12-28 14:12:27 +0100
committerBruno Haible <bruno@clisp.org>2020-12-28 14:40:58 +0100
commitbdfbc4326ccecb869529fc264e1d8700d9d9f034 (patch)
tree059e75b4698d82098a13e0d06c664542154af582 /gettext-runtime
parentf7a149a65195e69f50b398d1e5a992c1cb221390 (diff)
downloadgettext-bdfbc4326ccecb869529fc264e1d8700d9d9f034.tar.gz
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.
Diffstat (limited to 'gettext-runtime')
-rw-r--r--gettext-runtime/m4/Makefile.am1
-rw-r--r--gettext-runtime/m4/glibc21.m434
-rw-r--r--gettext-runtime/m4/intl.m43
3 files changed, 1 insertions, 37 deletions
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 3a94c2092..db798bbf2 100644
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,4 +1,4 @@
-# intl.m4 serial 45 (gettext-0.21.1)
+# intl.m4 serial 46 (gettext-0.21.1)
dnl Copyright (C) 1995-2014, 2016-2020 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
AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])