From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 15 Feb 2019 13:27:05 +0000 (+0000)
Subject: Implement --disable-signalled-io
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=969d4f6dd217c0f43271976760a5f321fe23e1aa;p=thirdparty%2Fntp.git

Implement --disable-signalled-io

bk: 5c66be29ZiKAhX_0LI77uA78FmPbYw
---

diff --git a/ChangeLog b/ChangeLog
index 44f36ea4d..242a7a46c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
   - added missing check, reported by Reinhard Max <perlinger@ntp.org>
 * [Bug 1674] runtime crashes and sync problems affecting both x86 and x86_64
   - this is a variant of [bug 3558] and should be fixed with it
+* Implement --disable-signalled-io
 
 ---
 (4.2.8p12) 2018/08/14 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 7aacde763..83bff4b93 100644
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -689,6 +689,9 @@ case "$ntp_have_solarisprivs" in
  yes)
     AC_DEFINE([HAVE_SOLARIS_PRIVS], [1],
 	[Are Solaris privileges available?])
+    ;;
+ '') ntp_have_solarisprivs="no"
+    ;;
 esac
 
 AC_MSG_RESULT([$ntp_have_solarisprivs])
@@ -710,6 +713,9 @@ case "$ntp_use_trustedbsd_mac$ac_cv_header_sys_mac_h" in
  yesyes)
     AC_DEFINE([HAVE_TRUSTEDBSD_MAC], [1],
 	[Are TrustedBSD MAC policy privileges available?])
+    ;;
+ *) ntp_use_trustedbsd_mac="no";
+    ;;
 esac
 
 AC_MSG_RESULT([$ntp_use_trustedbsd_mac])
@@ -883,6 +889,14 @@ AC_CHECK_HEADERS(
 AC_SEARCH_LIBS([MD5Init], [md5 md])
 AC_CHECK_FUNCS([MD5Init sysconf getdtablesize sigaction sigset sigvec])
 
+# HMS: does this need to be a cached variable?
+AC_ARG_ENABLE(
+    [signalled-io],
+    [AS_HELP_STRING([--enable-signalled-io], [s Use signalled IO if we can])],
+    [use_signalled_io=$enableval],
+    [use_signalled_io=yes]
+    )
+
 AC_CACHE_CHECK(
     [for SIGIO],
     [ntp_cv_hdr_def_sigio],
@@ -950,8 +964,14 @@ case "$ntp_cv_hdr_def_sigio" in
 esac
 case "$ans" in
  yes)
-    AC_DEFINE([HAVE_SIGNALED_IO], [1],
-	[Can we use SIGIO for tcp and udp IO?])
+    case "$use_signalled_io" in
+     yes)
+	AC_DEFINE([HAVE_SIGNALED_IO], [1],
+	    [Can we use SIGIO for tcp and udp IO?])
+	;;
+     *) ans="Allowed for $host but --disable-signalled-io was given"
+	;;
+    esac
 esac
 AC_MSG_RESULT([$ans])