From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 19 Jun 2010 04:59:28 +0000 (-0700)
Subject: [Bug 1576] sys/sysctl.h depends on sys/param.h on OpenBSD
X-Git-Tag: NTP_4_2_7P37~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39e743274b50dcf428c076dfb0944e8a29ca6d85;p=thirdparty%2Fntp.git

[Bug 1576] sys/sysctl.h depends on sys/param.h on OpenBSD

bk: 4c1c4eb0zOiZo9VjTKc6DBRtcdUzTQ
---

diff --git a/ChangeLog b/ChangeLog
index 5d68eb197..7b9e128f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1576] sys/sysctl.h depends on sys/param.h on OpenBSD.
 (4.2.7p36) 2010/06/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1560] Initial support for orphanwait, from Dave Mills.
 * clock_filter()/reachability fixes from Dave Mills.
diff --git a/configure.ac b/configure.ac
index 855c46cac..313e4bb3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -545,8 +545,13 @@ case "$host" in
  *) AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h)
     ;;
 esac
-AC_CHECK_HEADERS(sys/stat.h sys/stream.h)
-AC_CHECK_HEADERS(sys/stropts.h sys/sysctl.h sys/syssgi.h sys/systune.h)
+AC_CHECK_HEADERS(sys/stat.h sys/stream.h sys/stropts.h)
+# sys/sysctl.h depends on sys/param.h on OpenBSD - Bug 1576
+AC_CHECK_HEADERS(sys/sysctl.h, [], [],
+[#if defined HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif])
+AC_CHECK_HEADERS(sys/syssgi.h sys/systune.h)
 AC_CHECK_HEADERS(sys/termios.h sys/time.h sys/signal.h)
 AC_EGREP_CPP(yes,
 [#if HAVE_SYS_TIME_H