From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 5 Apr 2014 10:02:25 +0000 (+0200)
Subject: updated for version 7.4.246
X-Git-Tag: v7.4.246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ed89cdf41cf3d509fd30e6f7c577a7c090679a9;p=vim

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)
---

diff --git a/src/auto/configure b/src/auto/configure
index b73bc99af..0b9ea5a94 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 22ff9fd8a..b22b9ea5c 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 e38acfbd5..420f4e3c3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    246,
 /**/
     245,
 /**/