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)

diff --git a/src/auto/configure b/src/auto/configure
index 6e02374173c9fc614f573fc775a6f927f829159c..208032ad6b4e989508b500c1794dbdbb1dba7000 100755 (executable)
--- 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 938a77f914f3604bc04c5b4609a58a493e837af0..d08986ed9801261cc7b6214e802952f28415875d 100644 (file)
--- 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 70340e045f452d2fe84afbf62c40280e4de6877d..6cb6e2cd3658fb6493b79b05ec8eb170fedadb6a 100644 (file)
--- 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,
 /**/