From 04dbba2c7a80b8f3f2dbf7a66a75de2a9eaeb744 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Sat, 8 Sep 2007 13:26:16 +0000
Subject: [PATCH] Autoconf fixes for Net/FreeBSD (M. Dolze)

---
 ChangeLog                        | 1 +
 clients/lcdproc/machine_NetBSD.c | 2 +-
 configure.in                     | 9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c0ca44..cc9f098 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ v.0.5dev (ongoing development)
  * serialPOS driver: input support, cleanup (Eric Pooch)
  + new driver shuttleVFD for USB-based Shuttle VFDs (Thien Vu)
  * enable building lcdproc client on FreeBSD AMD64 platform (M. Dolze)
+ * Autoconf fixes for Net/FreeBSD (M. Dolze)
 
 v.0.5.2
  * fix switching on/off the Load screen in lcdproc client using the menu
diff --git a/clients/lcdproc/machine_NetBSD.c b/clients/lcdproc/machine_NetBSD.c
index f2acdab..11abd72 100644
--- a/clients/lcdproc/machine_NetBSD.c
+++ b/clients/lcdproc/machine_NetBSD.c
@@ -48,7 +48,7 @@
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <sys/dkstat.h>
-#include <sys/sched.h>
+#include <sched.h>
 #include <uvm/uvm_extern.h>
 #include <machine/apmvar.h>
 #include <errno.h>
diff --git a/configure.in b/configure.in
index f392132..ca45bd2 100644
--- a/configure.in
+++ b/configure.in
@@ -107,10 +107,17 @@ AC_CHECK_LIB(kvm, kvm_open,[
 ])
 
 dnl NetBSD, OpenBSD and FreeBSD
-AC_CHECK_HEADERS(sched.h sys/sched.h machine/cpufunc.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h machine/apm_bios.h)
+AC_CHECK_HEADERS(sched.h sys/types.h machine/pio.h machine/sysarch.h sys/cpuvar.h machine/apm_bios.h)
 ETR_SYSV_IPC
 ETR_UNION_SEMUN
 
+dnl machine/cpufunc.h needs additional header on FreeBSD
+AC_CHECK_HEADERS([machine/cpufunc.h], [], [],
+[[#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+]])
+
 dnl sched_setscheduler on OpenBSD
 AC_CHECK_FUNCS(sched_setscheduler)
 AC_CHECK_LIB(posix4, sched_setscheduler, [