diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-04-10 20:00:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-04-10 20:00:15 +0200 |
| commit | e29b1feead084f19e862bd719f140a490e3ed7f2 (patch) | |
| tree | 4203ebd01d98f8c1ed1cbe74d4f4b004bf8063ed | |
| parent | c09551ab796af1f8aa19338d99e49267860fcd9c (diff) | |
updated for version 7.4.255v7.4.255
Problem: Configure check for smack doesn't work with all shells. (David
Larson)
Solution: Remove spaces in set command.
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index fa047b5c11..bf40dea4db 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4637,7 +4637,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $as_echo "yes" >&6; } else { $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 rm -f conftest* @@ -9303,7 +9303,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $as_echo "yes" >&6; } else { $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 rm -f conftest* diff --git a/src/configure.in b/src/configure.in index e97878012e..4b450ce04b 100644 --- a/src/configure.in +++ b/src/configure.in @@ -405,7 +405,7 @@ if test "$enable_smack" = "yes"; then AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h) AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>], AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); enable_smack = "no") + AC_MSG_RESULT(no); enable_smack="no") fi if test "$enable_smack" = "yes"; then 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_EGREP_CPP(XIMText, [#include <X11/Xlib.h>], 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 CPPFLAGS=$cppflags_save diff --git a/src/version.c b/src/version.c index e236ae877f..180a894125 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 */ /**/ + 255, +/**/ 254, /**/ 253, |