aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.0.1379: configure check for selinux does not check for header file

Browse Source 
Problem:    Configure check for selinux does not check for header file.
Solution:   Add an AC_CHECK_HEADER(). (Benny Siegert)
This commit is contained in:
Bram Moolenaar
2017-12-07 22:29:11 +01:00
parent 3388d33457
commit e4b78e2a42
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/auto/configure vendored
View File

@@ -4781,8 +4781,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 { $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; } $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; }
if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then : 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" LIBS="$LIBS -lselinux"
$as_echo "#define HAVE_SELINUX 1" >>confdefs.h $as_echo "#define HAVE_SELINUX 1" >>confdefs.h
fi
fi fi

3
src/configure.ac
View File

@@ -433,8 +433,9 @@ if test "x$found_smack" = "x"; then
if test "$enable_selinux" = "yes"; then if test "$enable_selinux" = "yes"; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_CHECK_LIB(selinux, is_selinux_enabled, AC_CHECK_LIB(selinux, is_selinux_enabled,
[AC_CHECK_HEADER(selinux/selinux.h,
[LIBS="$LIBS -lselinux" [LIBS="$LIBS -lselinux"
AC_DEFINE(HAVE_SELINUX)]) AC_DEFINE(HAVE_SELINUX)])])
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
fi fi

2
src/version.c
View File

@@ -771,6 +771,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1379,
/**/ /**/
1378, 1378,
/**/ /**/