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.255

Browse Source 
Problem:    Configure check for smack doesn't work with all shells. (David
            Larson)
Solution:   Remove spaces in set command.
This commit is contained in:
Bram Moolenaar 2014-04-10 20:00:15 +02:00
parent c09551ab79
commit e29b1feead
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/auto/configure vendored
View File

@ -4637,7 +4637,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }; enable_smack = "no" $as_echo "no" >&6; }; enable_smack="no"
fi fi
rm -f conftest* rm -f conftest*
@ -9303,7 +9303,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
$as_echo "no; xim has been disabled" >&6; }; enable_xim = "no" $as_echo "no; xim has been disabled" >&6; }; enable_xim="no"
fi fi
rm -f conftest* rm -f conftest*

4
src/configure.in
View File

@ -405,7 +405,7 @@ if test "$enable_smack" = "yes"; then
AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h) AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>], AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
AC_MSG_RESULT(no); enable_smack = "no") AC_MSG_RESULT(no); enable_smack="no")
fi fi
if test "$enable_smack" = "yes"; then if test "$enable_smack" = "yes"; then
AC_CHECK_LIB(attr, setxattr, AC_CHECK_LIB(attr, setxattr,
@ -2643,7 +2643,7 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_
AC_MSG_CHECKING(for XIMText in X11/Xlib.h) AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>], AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
AC_MSG_RESULT(no; xim has been disabled); enable_xim = "no") AC_MSG_RESULT(no; xim has been disabled); enable_xim="no")
fi fi
CPPFLAGS=$cppflags_save CPPFLAGS=$cppflags_save

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 */
/**/
255,
/**/ /**/
254, 254,
/**/ /**/