From 1b357ec51ac32ebc6262373a354ffd33e5bba8c0 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 20 Dec 2020 23:24:54 +0100 Subject: [PATCH] Remove some of the support for obsolete IRIX 4 and 5. * m4/mountlist.m4 (AC_FUNC_GETMNTENT): Don't test for getmntent in libsun. * tests/init.sh (setup_): Don't talk about IRIX 5. --- ChangeLog | 7 +++++++ m4/mountlist.m4 | 8 ++++---- tests/init.sh | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9af234b677..29f0264040 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2020-12-20 Bruno Haible + + Remove some of the support for obsolete IRIX 4 and 5. + * m4/mountlist.m4 (AC_FUNC_GETMNTENT): Don't test for getmntent in + libsun. + * tests/init.sh (setup_): Don't talk about IRIX 5. + 2020-12-20 Bruno Haible filemode: Remove Cray support. diff --git a/m4/mountlist.m4 b/m4/mountlist.m4 index 7756955ead..ec49036d9b 100644 --- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,4 +1,4 @@ -# serial 14 +# serial 15 dnl Copyright (C) 2002-2006, 2009-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, @@ -331,8 +331,8 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], # nowadays. AC_DEFUN([AC_FUNC_GETMNTENT], [ - # getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, - # -lgen on Unixware. - AC_SEARCH_LIBS([getmntent], [sun gen]) + # getmntent is in the standard C library on most systems, but in -lgen on + # Unixware. + AC_SEARCH_LIBS([getmntent], [gen]) AC_CHECK_FUNCS([getmntent]) ]) diff --git a/tests/init.sh b/tests/init.sh index b4a5944a72..8938a1fadb 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -389,7 +389,7 @@ setup_ () if test "$VERBOSE" = yes; then # Test whether set -x may cause the selected shell to corrupt an # application's stderr. Many do, including zsh-4.3.10 and the /bin/sh - # from SunOS 5.11, OpenBSD 4.7 and Irix 5.x and 6.5. + # from SunOS 5.11, OpenBSD 4.7 and Irix 6.5. # If enabling verbose output this way would cause trouble, simply # issue a warning and refrain. if $gl_set_x_corrupts_stderr_; then -- 2.39.5