From: Bruno Haible <bruno@clisp.org>
Date: Sat, 4 Jul 2020 20:21:28 +0000 (+0200)
Subject: Remove redundant code (redundant since 2008-10-19).
X-Git-Tag: v0.21~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478eabdb3af0b7ea44a4064cedb315adf62a9afb;p=thirdparty%2Fgettext.git

Remove redundant code (redundant since 2008-10-19).

* gnulib-local/modules/wait-process.diff: Remove file.
* gnulib-local/m4/unionwait.m4: Remove file.
* gnulib-local/Makefile.am (EXTRA_DIST): Remove them.
---

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 94349ad0d..58207da17 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -157,7 +157,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/java.m4 \
 m4/libxml.m4 \
-m4/unionwait.m4 \
 modules/backupfile \
 modules/basename \
 modules/closeout \
@@ -169,7 +168,6 @@ modules/java \
 modules/libtextstyle-dummy \
 modules/libxml \
 modules/markup \
-modules/wait-process.diff \
 modules/xalloc \
 modules/xalloc-die \
 modules/xerror \
diff --git a/gnulib-local/m4/unionwait.m4 b/gnulib-local/m4/unionwait.m4
deleted file mode 100644
index ea3d4922b..000000000
--- a/gnulib-local/m4/unionwait.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-# unionwait.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1993-2002 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 Taken from GNU make 3.79.1.
-
-AC_DEFUN([gt_UNION_WAIT],
-[
-AC_CHECK_FUNCS(waitpid)
-AC_MSG_CHECKING(for union wait)
-AC_CACHE_VAL(gt_cv_union_wait, [dnl
-AC_TRY_LINK([#include <sys/types.h>
-#include <sys/wait.h>],
-            [union wait status; int pid; pid = wait (&status);
-#ifdef WEXITSTATUS
-/* Some POSIXoid systems have both the new-style macros and the old
-   union wait type, and they do not work together.  If union wait
-   conflicts with WEXITSTATUS et al, we don't want to use it at all.  */
-if (WEXITSTATUS (status) != 0) pid = -1;
-#ifdef WTERMSIG
-/* If we have WEXITSTATUS and WTERMSIG, just use them on ints.  */
--- blow chunks here --
-#endif
-#endif
-#ifdef HAVE_WAITPID
-/* Make sure union wait works with waitpid.  */
-pid = waitpid (-1, &status, 0);
-#endif
-],
-            [gt_cv_union_wait=yes], [gt_cv_union_wait=no])])
-if test "$gt_cv_union_wait" = yes; then
-  AC_DEFINE(HAVE_UNION_WAIT, 1,
-            [Define if <sys/wait.h> defines the 'union wait' type.])
-fi
-AC_MSG_RESULT($gt_cv_union_wait)
-])
diff --git a/gnulib-local/modules/wait-process.diff b/gnulib-local/modules/wait-process.diff
deleted file mode 100644
index e56e2b870..000000000
--- a/gnulib-local/modules/wait-process.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-*** gnulib/modules/wait-process	2006-04-24 13:38:06.000000000 +0200
---- wait-process	2006-07-30 16:45:20.000000000 +0200
-***************
-*** 6,11 ****
---- 6,12 ----
-  lib/wait-process.c
-  m4/wait-process.m4
-  m4/sig_atomic_t.m4
-+ m4/unionwait.m4
-  
-  Depends-on:
-  fatal-signal
-***************
-*** 18,23 ****
---- 19,25 ----
-  
-  configure.ac:
-  gl_WAIT_PROCESS
-+ gt_UNION_WAIT
-  
-  Makefile.am:
-  lib_SOURCES += wait-process.h wait-process.c