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 6e02374..208032a 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4781,8 +4781,13 @@
{ $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 938a77f..d08986e 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -433,8 +433,9 @@
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 70340e0..6cb6e2c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1379,
+/**/
1378,
/**/
1377,