Mercurial > vim
changeset 5804:2cbac5608217 v7.4.246
updated for version 7.4.246
Problem: Configure message for detecting smack are out of sequence.
Solution: Put the messages in the right place. (Kazunobu Kuriyama)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sat, 05 Apr 2014 12:02:25 +0200 |
parents | 8bf05884266b |
children | 2db11543541a |
files | src/auto/configure src/configure.in src/version.c |
diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -4600,6 +4600,8 @@ else fi 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" if test "x$ac_cv_header_linux_xattr_h" = xyes; then : true @@ -4608,10 +4610,11 @@ else fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi 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_n "checking for llistxattr in -lattr... " >&6; } if ${ac_cv_lib_attr_llistxattr+:} false; then : @@ -4655,9 +4658,6 @@ if test "x$ac_cv_lib_attr_llistxattr" = fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } fi if test "x$found_smack" = "x"; then
--- a/src/configure.in +++ b/src/configure.in @@ -393,16 +393,16 @@ AC_ARG_ENABLE(smack, [ --disable-smack Do not check for Smack support.], , enable_smack="yes") if test "$enable_smack" = "yes"; then + AC_MSG_RESULT(no) AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no") +else + AC_MSG_RESULT(yes) fi if test "$enable_smack" = "yes"; then - AC_MSG_RESULT(no) AC_CHECK_LIB(attr, llistxattr, [LIBS="$LIBS -lattr" found_smack="yes" AC_DEFINE(HAVE_SMACK)]) -else - AC_MSG_RESULT(yes) fi dnl When smack was found don't search for SELinux