To: vim_dev@googlegroups.com Subject: Patch 8.0.1379 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1379 Problem: Configure check for selinux does not check for header file. Solution: Add an AC_CHECK_HEADER(). (Benny Siegert) Files: src/configure.ac, src/auto/configure *** ../vim-8.0.1378/src/configure.ac 2017-11-16 17:03:41.948727893 +0100 --- src/configure.ac 2017-12-07 22:25:10.149655925 +0100 *************** *** 433,440 **** if test "$enable_selinux" = "yes"; then AC_MSG_RESULT(no) AC_CHECK_LIB(selinux, is_selinux_enabled, [LIBS="$LIBS -lselinux" ! AC_DEFINE(HAVE_SELINUX)]) else AC_MSG_RESULT(yes) fi --- 433,441 ---- 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)])]) else AC_MSG_RESULT(yes) fi *** ../vim-8.0.1378/src/auto/configure 2017-11-16 17:03:41.952727829 +0100 --- src/auto/configure 2017-12-07 22:25:15.045635089 +0100 *************** *** 4781,4788 **** { $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 : LIBS="$LIBS -lselinux" ! $as_echo "#define HAVE_SELINUX 1" >>confdefs.h fi --- 4781,4793 ---- { $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 ! ! fi ! fi *** ../vim-8.0.1378/src/version.c 2017-12-07 22:22:46.158236891 +0100 --- src/version.c 2017-12-07 22:28:45.872684251 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1379, /**/ -- How many light bulbs does it take to change a person? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///