[dpkg] 184/200: build: Check <sys/proc.h> by also including <sys/param.h>

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit 5c32516dcad58980481ae85c71e65eaeb97865e1
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Feb 11 19:58:09 2017 +0100

    build: Check <sys/proc.h> by also including <sys/param.h>
    
    On several BSD systems the header is not self-contained and requires
    <sys/param.h> to compile, add the pre-requisite so that the check
    succeeds there.
---
 configure.ac     | 6 +++++-
 debian/changelog | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3bc6256..d507550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,11 +104,15 @@ AC_CHECK_HEADERS([\
   sys/sysctl.h \
   sys/syscall.h \
   sys/user.h \
-  sys/proc.h \
   sys/procfs.h \
   sys/pstat.h \
   linux/fiemap.h \
 ])
+AC_CHECK_HEADERS([sys/proc.h], [], [], [
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+])
 
 AS_IF([test "x$build_dselect" = "xyes"], [
   AC_LANG_PUSH([C++])
diff --git a/debian/changelog b/debian/changelog
index 2c8a2f8..ec1be39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
       Proposed by Dieter Adriaenssens <dieter.adriaenssens at gmail.com>.
     - Document dpkg-source --before-build and --after-build in --help output.
     - Document dpkg-buildpackage --ignore-builtin-builddeps in --help output.
+  * Build system:
+    - Check <sys/proc.h> by also including <sys/param.h>, on several BSD
+      systems the header is not self-contained.
 
  -- Guillem Jover <guillem at debian.org>  Wed, 01 Feb 2017 06:28:28 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git