From e29b1feead084f19e862bd719f140a490e3ed7f2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 10 Apr 2014 20:00:15 +0200 Subject: [PATCH] updated for version 7.4.255 Problem: Configure check for smack doesn't work with all shells. (David Larson) Solution: Remove spaces in set command. --- src/auto/configure | 4 ++-- src/configure.in | 4 ++-- src/version.c | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index fa047b5c1..bf40dea4d 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 e97878012..4b450ce04 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 ], 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 ], 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 e236ae877..180a89412 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 */ +/**/ + 255, /**/ 254, /**/ -- 2.50.1