From 4a5ecad0380d8b516ebc0ad5e08df80970e08883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 5 Sep 2018 13:31:27 +0200
Subject: [PATCH] Replace custom HAVE_SIGWAIT define with AC_CHECK_FUNCS

---
 acconfig.h   |  3 ---
 config.h.in  |  3 ---
 configure    | 46 +---------------------------------------------
 configure.in |  6 +-----
 4 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index 2ab1a827cd..7b87198d04 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -17,9 +17,6 @@
  ***/
 @TOP@
 
-/** define if your system has sigwait() */
-#undef HAVE_SIGWAIT
-
 /** define if sysctlbyname() is available */
 #undef HAVE_SYSCTLBYNAME
 
diff --git a/config.h.in b/config.h.in
index 3cc00140c0..eeeea85bc6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -17,9 +17,6 @@
  *** it does not get installed.
  ***/
 
-/** define if your system has sigwait() */
-#undef HAVE_SIGWAIT
-
 /** define if sysctlbyname() is available */
 #undef HAVE_SYSCTLBYNAME
 
diff --git a/configure b/configure
index 701d58e226..293ecfe419 100755
--- a/configure
+++ b/configure
@@ -15266,54 +15266,10 @@ done
 
 
 #
-# Additional OS-specific issues related to pthreads and sigwait.
+# Additional OS-specific issues related to pthreads.
 #
 case "$host" in
-	#
-	# One more place to look for sigwait.
-	#
 	*-freebsd*)
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sigwait in -lc_r" >&5
-$as_echo_n "checking for sigwait in -lc_r... " >&6; }
-if ${ac_cv_lib_c_r_sigwait+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char sigwait ();
-int
-main ()
-{
-return sigwait ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_r_sigwait=yes
-else
-  ac_cv_lib_c_r_sigwait=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_sigwait" >&5
-$as_echo "$ac_cv_lib_c_r_sigwait" >&6; }
-if test "x$ac_cv_lib_c_r_sigwait" = xyes; then :
-  $as_echo "#define HAVE_SIGWAIT 1" >>confdefs.h
-
-fi
-
 		case $host in
 		*-freebsd5.[012]|*-freebsd5.[012].*);;
 		*-freebsd5.[3456789]|*-freebsd5.[3456789].*)
diff --git a/configure.in b/configure.in
index fd135f7436..d4fe8ebc1d 100644
--- a/configure.in
+++ b/configure.in
@@ -734,14 +734,10 @@ AC_SEARCH_LIBS([sched_yield],[rt])
 AC_CHECK_FUNCS([sched_yield pthread_yield pthread_yield_np])
 
 #
-# Additional OS-specific issues related to pthreads and sigwait.
+# Additional OS-specific issues related to pthreads.
 #
 case "$host" in
-	#
-	# One more place to look for sigwait.
-	#
 	*-freebsd*)
-		AC_CHECK_LIB(c_r, sigwait, AC_DEFINE(HAVE_SIGWAIT),)
 		case $host in
 		*-freebsd5.[[012]]|*-freebsd5.[[012]].*);;
 		*-freebsd5.[[3456789]]|*-freebsd5.[[3456789]].*)