aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.246

Browse Source 
Problem:    Configure message for detecting smack are out of sequence.
Solution:   Put the messages in the right place. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2014-04-05 12:02:25 +02:00
parent 21e854e5ce
commit 4ed89cdf41
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/auto/configure vendored
View File

@ -4600,6 +4600,8 @@ else
fi fi
if test "$enable_smack" = "yes"; then if test "$enable_smack" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_xattr_h" = xyes; then : if test "x$ac_cv_header_linux_xattr_h" = xyes; then :
true true
@ -4608,10 +4610,11 @@ else
fi fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi fi
if test "$enable_smack" = "yes"; then if test "$enable_smack" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for llistxattr in -lattr" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for llistxattr in -lattr" >&5
$as_echo_n "checking for llistxattr in -lattr... " >&6; } $as_echo_n "checking for llistxattr in -lattr... " >&6; }
if ${ac_cv_lib_attr_llistxattr+:} false; then : if ${ac_cv_lib_attr_llistxattr+:} false; then :
@ -4655,9 +4658,6 @@ if test "x$ac_cv_lib_attr_llistxattr" = xyes; then :
fi fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi fi
if test "x$found_smack" = "x"; then if test "x$found_smack" = "x"; then

6
src/configure.in
View File

@ -393,16 +393,16 @@ AC_ARG_ENABLE(smack,
[ --disable-smack Do not check for Smack support.], [ --disable-smack Do not check for Smack support.],
, enable_smack="yes") , enable_smack="yes")
if test "$enable_smack" = "yes"; then if test "$enable_smack" = "yes"; then
AC_MSG_RESULT(no)
AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no") AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
else
AC_MSG_RESULT(yes)
fi fi
if test "$enable_smack" = "yes"; then if test "$enable_smack" = "yes"; then
AC_MSG_RESULT(no)
AC_CHECK_LIB(attr, llistxattr, AC_CHECK_LIB(attr, llistxattr,
[LIBS="$LIBS -lattr" [LIBS="$LIBS -lattr"
found_smack="yes" found_smack="yes"
AC_DEFINE(HAVE_SMACK)]) AC_DEFINE(HAVE_SMACK)])
else
AC_MSG_RESULT(yes)
fi fi
dnl When smack was found don't search for SELinux dnl When smack was found don't search for SELinux

2
src/version.c
View File

@ -734,6 +734,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 */
/**/
246,
/**/ /**/
245, 245,
/**/ /**/