diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-04-05 12:02:25 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-04-05 12:02:25 +0200 |
| commit | 4ed89cdf41cf3d509fd30e6f7c577a7c090679a9 (patch) | |
| tree | 1f486635fd389d67ef1b36467f42dc71e21525f3 | |
| parent | 21e854e5ce08ad419441136b1698d535ff818a72 (diff) | |
updated for version 7.4.246v7.4.246
Problem: Configure message for detecting smack are out of sequence.
Solution: Put the messages in the right place. (Kazunobu Kuriyama)
| -rwxr-xr-x | src/auto/configure | 10 | ||||
| -rw-r--r-- | src/configure.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/auto/configure b/src/auto/configure index b73bc99afc..0b9ea5a946 100755 --- 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" = xyes; then : fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } fi if test "x$found_smack" = "x"; then diff --git a/src/configure.in b/src/configure.in index 22ff9fd8ac..b22b9ea5cd 100644 --- 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 diff --git a/src/version.c b/src/version.c index e38acfbd5b..420f4e3c3f 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 246, +/**/ 245, /**/ 244, |