From e4b78e2a42e9030348770764c478b73caa925539 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 7 Dec 2017 22:29:11 +0100
Subject: patch 8.0.1379: configure check for selinux does not check for header
 file

Problem:    Configure check for selinux does not check for header file.
Solution:   Add an AC_CHECK_HEADER(). (Benny Siegert)
---
 src/auto/configure | 7 ++++++-
 src/configure.ac   | 3 ++-
 src/version.c      | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/auto/configure b/src/auto/configure
index 6e0237417..208032ad6 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4781,8 +4781,13 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5
 $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
 if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then :
+  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
   LIBS="$LIBS -lselinux"
-	     $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+	    $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
+
+fi
+
 
 fi
 
diff --git a/src/configure.ac b/src/configure.ac
index 938a77f91..d08986ed9 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -433,8 +433,9 @@ if test "x$found_smack" = "x"; then
   if test "$enable_selinux" = "yes"; then
     AC_MSG_RESULT(no)
     AC_CHECK_LIB(selinux, is_selinux_enabled,
+	[AC_CHECK_HEADER(selinux/selinux.h,
 	    [LIBS="$LIBS -lselinux"
-	     AC_DEFINE(HAVE_SELINUX)])
+	    AC_DEFINE(HAVE_SELINUX)])])
   else
      AC_MSG_RESULT(yes)
   fi
diff --git a/src/version.c b/src/version.c
index 70340e045..6cb6e2cd3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1379,
 /**/
     1378,
 /**/
-- 
cgit v1.2.1