Require sys/capsicum.h to use Capsicum.

My PC-BSD 9.1 VM, at least, has sys/capability.h but not sys/capsicum.h;
we now use sys/capsicum.h, so require it to be present (which it is in
FreeBSD 10 and later).

1 files changed, 14 insertions, 1 deletions

diff --git a/configure b/configure
index 25ffe864..16a3ac0b 100755
--- a/configure
+++ b/configure
@@ -4332,7 +4332,16 @@ fi
 # present, imply others are present?
 #
 if test ! -z "$with_sandbox-capsicum" && test "$with_sandbox-capsicum" != "no" ; then
-	for ac_func in cap_enter cap_rights_limit cap_ioctls_limit openat
+	#
+	# First, make sure we have the required header.
+	#
+	ac_fn_c_check_header_mongrel "$LINENO" "sys/capsicum.h" "ac_cv_header_sys_capsicum_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_capsicum_h" = xyes; then :
+
+		#
+		# We do; now make sure we have the required functions.
+		#
+		for ac_func in cap_enter cap_rights_limit cap_ioctls_limit openat
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -4346,6 +4355,10 @@ else
 fi
 done
 
+
+fi
+
+
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cap_init in -lcasper" >&5
 $as_echo_n "checking for cap_init in -lcasper... " >&6; }
 if ${ac_cv_lib_casper_cap_init+:} false; then :