- Forward-port -r1732 [Dropped support for linux rt signals]

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1736 82007160-df01-0410-b94d-b575c5fd34c7

1 files changed, 3 insertions, 18 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 476c996..bbd79fb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -24,7 +24,6 @@ AC_DEFUN([AX_ARG_ENABLE_IOLOOP_MECHANISM],[
   AC_ARG_ENABLE([kqueue], [AS_HELP_STRING([--enable-kqueue], [Force kqueue usage.])], [desired_iopoll_mechanism="kqueue"])
   AC_ARG_ENABLE([epoll],  [AS_HELP_STRING([--enable-epoll],  [Force epoll usage.])],  [desired_iopoll_mechanism="epoll"])
   AC_ARG_ENABLE([devpoll],[AS_HELP_STRING([--enable-devpoll],[Force devpoll usage.])],[desired_iopoll_mechanism="devpoll"])
-  AC_ARG_ENABLE([rtsigio],[AS_HELP_STRING([--enable-rtsigio],[Force rtsigio usage.])],[desired_iopoll_mechanism="rtsigio"])
   AC_ARG_ENABLE([poll],   [AS_HELP_STRING([--enable-poll],   [Force poll usage.])],   [desired_iopoll_mechanism="poll"]) 
   AC_ARG_ENABLE([select], [AS_HELP_STRING([--enable-select], [Force select usage.])], [desired_iopoll_mechanism="select"])
   dnl }}}
@@ -85,33 +84,19 @@ _syscall1(int, epoll_create, int, size)
     AC_DEFINE([HAVE_SYS_DEVPOLL_H],[1],[Define to 1 if you have the <sys/devpoll.h> header file.])
   fi
   dnl }}}
-  dnl {{{ check for rtsigio mechanism support
-  iopoll_mechanism_rtsigio=4
-  AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_RTSIGIO],[$iopoll_mechanism_rtsigio],[rtsigio mechanism])
-  AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-#define _GNU_SOURCE
-#include <fcntl.h>
-static unsigned int have_f_setsig = 0;
-  ]], [[
-#ifdef F_SETSIG
-  have_f_setsig = 1;
-#endif
-  return have_f_setsig == 0;
-  ]])], [is_rtsigio_mechanism_available="yes"],[is_rtsigio_mechanism_available="no"])
-  dnl }}}
   dnl {{{ check for poll mechanism support
-  iopoll_mechanism_poll=5
+  iopoll_mechanism_poll=4
   AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_POLL],[$iopoll_mechanism_poll],[poll mechanism])
   AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([poll])],[is_poll_mechanism_available="yes"],[is_poll_mechanism_available="no"])
   dnl }}}
   dnl {{{ check for select mechanism support
-  iopoll_mechanism_select=6
+  iopoll_mechanism_select=5
   AC_DEFINE_UNQUOTED([__IOPOLL_MECHANISM_SELECT],[$iopoll_mechanism_select],[select mechanism])
   AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([select])],[is_select_mechanism_available="yes"],[is_select_mechanism_available="no"])
   dnl }}}
   dnl {{{ determine the optimal mechanism
   optimal_iopoll_mechanism="none"
-  for mechanism in "kqueue" "epoll" "devpoll" "rtsigio" "poll" "select" ; do # order is important
+  for mechanism in "kqueue" "epoll" "devpoll" "poll" "select" ; do # order is important
     eval "is_optimal_iopoll_mechanism_available=\$is_${mechanism}_mechanism_available"
     if test "$is_optimal_iopoll_mechanism_available" = "yes" ; then
       optimal_iopoll_mechanism="$mechanism"