s-s-d: Detect system specific headers at configure time

Instead of hardcoding their usage depending on system macros.

configure.ac

@@ -66,8 +66,9 @@ fi
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h error.h locale.h libintl.h kvm.h \
-                  sys/syscall.h linux/fiemap.h])
+AC_CHECK_HEADERS([stddef.h error.h err.h locale.h libintl.h kvm.h \
+                  sys/param.h sys/sysctl.h sys/syscall.h sys/user.h \
+                  sys/proc.h sys/pstat.h linux/fiemap.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN

debian/changelog

@@ -62,6 +62,8 @@ dpkg (1.17.7) UNRELEASED; urgency=low
       on such system anymore. Note that GNU/kFreeBSD is still using Linux
       procfs code (which ends up using linprocfs).
     - Fix OpenBSD KVM code to use current kinfo_proc layout.
+    - Detect system specific headers at configure time instead of hardcoding
+      their usage depending on system macros.
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).

utils/start-stop-daemon.c

@@ -43,29 +43,24 @@
 #  error Unknown architecture - cannot build start-stop-daemon
 #endif
 
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
-
-#if defined(OSOpenBSD) || defined(OSFreeBSD) || defined(OSNetBSD)
-#include <sys/param.h>
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#ifdef HAVE_SYS_PROC_H
 #include <sys/proc.h>
-
-#include <err.h>
 #endif
-
-#ifdef HAVE_KVM_H
-#include <sys/sysctl.h>
+#ifdef HAVE_SYS_USER_H
 #include <sys/user.h>
-
-#include <kvm.h>
 #endif
-
-#if defined(OShpux)
-#include <sys/param.h>
+#ifdef HAVE_SYS_PSTAT_H
 #include <sys/pstat.h>
 #endif
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -91,16 +86,22 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
-
 #ifdef HAVE_ERROR_H
 #include <error.h>
 #endif
+#ifdef HAVE_ERR_H
+#include <err.h>
+#endif
 
 #if defined(OSHurd)
 #include <hurd.h>
 #include <ps.h>
 #endif
 
+#ifdef HAVE_KVM_H
+#include <kvm.h>
+#endif
+
 #ifdef _POSIX_PRIORITY_SCHEDULING
 #include <sched.h>
 #else