|
 |
e267e01 |
To: vim_dev@googlegroups.com
|
|
|
e267e01 |
Subject: Patch 7.4.246
|
|
|
e267e01 |
Fcc: outbox
|
|
|
e267e01 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
e267e01 |
Mime-Version: 1.0
|
|
|
e267e01 |
Content-Type: text/plain; charset=UTF-8
|
|
|
e267e01 |
Content-Transfer-Encoding: 8bit
|
|
|
e267e01 |
------------
|
|
|
e267e01 |
|
|
|
e267e01 |
Patch 7.4.246
|
|
|
e267e01 |
Problem: Configure message for detecting smack are out of sequence.
|
|
|
e267e01 |
Solution: Put the messages in the right place. (Kazunobu Kuriyama)
|
|
|
e267e01 |
Files: src/configure.in, src/auto/configure
|
|
|
e267e01 |
|
|
|
e267e01 |
|
|
|
e267e01 |
*** ../vim-7.4.245/src/configure.in 2014-04-02 14:05:33.999887839 +0200
|
|
|
e267e01 |
--- src/configure.in 2014-04-05 11:56:33.807099380 +0200
|
|
|
e267e01 |
***************
|
|
|
e267e01 |
*** 393,408 ****
|
|
|
e267e01 |
[ --disable-smack Do not check for Smack support.],
|
|
|
e267e01 |
, enable_smack="yes")
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
- AC_MSG_RESULT(no)
|
|
|
e267e01 |
AC_CHECK_LIB(attr, llistxattr,
|
|
|
e267e01 |
[LIBS="$LIBS -lattr"
|
|
|
e267e01 |
found_smack="yes"
|
|
|
e267e01 |
AC_DEFINE(HAVE_SMACK)])
|
|
|
e267e01 |
- else
|
|
|
e267e01 |
- AC_MSG_RESULT(yes)
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
dnl When smack was found don't search for SELinux
|
|
|
e267e01 |
--- 393,408 ----
|
|
|
e267e01 |
[ --disable-smack Do not check for Smack support.],
|
|
|
e267e01 |
, enable_smack="yes")
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
+ AC_MSG_RESULT(no)
|
|
|
e267e01 |
AC_CHECK_HEADER([linux/xattr.h], true, enable_smack="no")
|
|
|
e267e01 |
+ else
|
|
|
e267e01 |
+ AC_MSG_RESULT(yes)
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
AC_CHECK_LIB(attr, llistxattr,
|
|
|
e267e01 |
[LIBS="$LIBS -lattr"
|
|
|
e267e01 |
found_smack="yes"
|
|
|
e267e01 |
AC_DEFINE(HAVE_SMACK)])
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
dnl When smack was found don't search for SELinux
|
|
|
e267e01 |
*** ../vim-7.4.245/src/auto/configure 2014-04-02 14:05:34.003887839 +0200
|
|
|
e267e01 |
--- src/auto/configure 2014-04-05 11:56:37.123099387 +0200
|
|
|
e267e01 |
***************
|
|
|
e267e01 |
*** 4600,4605 ****
|
|
|
e267e01 |
--- 4600,4607 ----
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
e267e01 |
+ $as_echo "no" >&6; }
|
|
|
e267e01 |
ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default"
|
|
|
e267e01 |
if test "x$ac_cv_header_linux_xattr_h" = xyes; then :
|
|
|
e267e01 |
true
|
|
|
e267e01 |
***************
|
|
|
e267e01 |
*** 4608,4617 ****
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
|
e267e01 |
- $as_echo "no" >&6; }
|
|
|
e267e01 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for llistxattr in -lattr" >&5
|
|
|
e267e01 |
$as_echo_n "checking for llistxattr in -lattr... " >&6; }
|
|
|
e267e01 |
if ${ac_cv_lib_attr_llistxattr+:} false; then :
|
|
|
e267e01 |
--- 4610,4620 ----
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
|
|
|
e267e01 |
+ else
|
|
|
e267e01 |
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
e267e01 |
+ $as_echo "yes" >&6; }
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
if test "$enable_smack" = "yes"; then
|
|
|
e267e01 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for llistxattr in -lattr" >&5
|
|
|
e267e01 |
$as_echo_n "checking for llistxattr in -lattr... " >&6; }
|
|
|
e267e01 |
if ${ac_cv_lib_attr_llistxattr+:} false; then :
|
|
|
e267e01 |
***************
|
|
|
e267e01 |
*** 4655,4663 ****
|
|
|
e267e01 |
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
- else
|
|
|
e267e01 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
|
e267e01 |
- $as_echo "yes" >&6; }
|
|
|
e267e01 |
fi
|
|
|
e267e01 |
|
|
|
e267e01 |
if test "x$found_smack" = "x"; then
|
|
|
e267e01 |
--- 4658,4663 ----
|
|
|
e267e01 |
*** ../vim-7.4.245/src/version.c 2014-04-04 19:00:46.351940169 +0200
|
|
|
e267e01 |
--- src/version.c 2014-04-05 11:57:29.503099502 +0200
|
|
|
e267e01 |
***************
|
|
|
e267e01 |
*** 736,737 ****
|
|
|
e267e01 |
--- 736,739 ----
|
|
|
e267e01 |
{ /* Add new patch number below this line */
|
|
|
e267e01 |
+ /**/
|
|
|
e267e01 |
+ 246,
|
|
|
e267e01 |
/**/
|
|
|
e267e01 |
|
|
|
e267e01 |
--
|
|
|
e267e01 |
Apparently, 1 in 5 people in the world are Chinese. And there are 5
|
|
|
e267e01 |
people in my family, so it must be one of them. It's either my mum
|
|
|
e267e01 |
or my dad. Or my older brother Colin. Or my younger brother
|
|
|
e267e01 |
Ho-Cha-Chu. But I think it's Colin.
|
|
|
e267e01 |
|
|
|
e267e01 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
e267e01 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
e267e01 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
e267e01 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|