Blame SOURCES/7.4.255

22c937
To: vim_dev@googlegroups.com
22c937
Subject: Patch 7.4.255
22c937
Fcc: outbox
22c937
From: Bram Moolenaar <Bram@moolenaar.net>
22c937
Mime-Version: 1.0
22c937
Content-Type: text/plain; charset=UTF-8
22c937
Content-Transfer-Encoding: 8bit
22c937
------------
22c937
22c937
Patch 7.4.255
22c937
Problem:    Configure check for smack doesn't work with all shells. (David
22c937
	    Larson)
22c937
Solution:   Remove spaces in set command.
22c937
Files:	    src/configure.in, src/auto/configure
22c937
22c937
22c937
*** ../vim-7.4.254/src/configure.in	2014-04-10 11:09:11.676036810 +0200
22c937
--- src/configure.in	2014-04-10 19:53:38.884105545 +0200
22c937
***************
22c937
*** 405,411 ****
22c937
    AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
22c937
    AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
22c937
  	       AC_MSG_RESULT(yes),
22c937
! 	       AC_MSG_RESULT(no); enable_smack = "no")
22c937
  fi
22c937
  if test "$enable_smack" = "yes"; then
22c937
    AC_CHECK_LIB(attr, setxattr,
22c937
--- 405,411 ----
22c937
    AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
22c937
    AC_EGREP_CPP(XATTR_NAME_SMACKEXEC, [#include <linux/xattr.h>],
22c937
  	       AC_MSG_RESULT(yes),
22c937
! 	       AC_MSG_RESULT(no); enable_smack="no")
22c937
  fi
22c937
  if test "$enable_smack" = "yes"; then
22c937
    AC_CHECK_LIB(attr, setxattr,
22c937
***************
22c937
*** 2643,2649 ****
22c937
      AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
22c937
      AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
22c937
  		  AC_MSG_RESULT(yes),
22c937
! 		  AC_MSG_RESULT(no; xim has been disabled); enable_xim = "no")
22c937
    fi
22c937
    CPPFLAGS=$cppflags_save
22c937
  
22c937
--- 2643,2649 ----
22c937
      AC_MSG_CHECKING(for XIMText in X11/Xlib.h)
22c937
      AC_EGREP_CPP(XIMText, [#include <X11/Xlib.h>],
22c937
  		  AC_MSG_RESULT(yes),
22c937
! 		  AC_MSG_RESULT(no; xim has been disabled); enable_xim="no")
22c937
    fi
22c937
    CPPFLAGS=$cppflags_save
22c937
  
22c937
*** ../vim-7.4.254/src/auto/configure	2014-04-10 11:09:11.684036810 +0200
22c937
--- src/auto/configure	2014-04-10 19:53:54.032105578 +0200
22c937
***************
22c937
*** 4637,4643 ****
22c937
  $as_echo "yes" >&6; }
22c937
  else
22c937
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22c937
! $as_echo "no" >&6; }; enable_smack = "no"
22c937
  fi
22c937
  rm -f conftest*
22c937
  
22c937
--- 4637,4643 ----
22c937
  $as_echo "yes" >&6; }
22c937
  else
22c937
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22c937
! $as_echo "no" >&6; }; enable_smack="no"
22c937
  fi
22c937
  rm -f conftest*
22c937
  
22c937
***************
22c937
*** 9303,9309 ****
22c937
  $as_echo "yes" >&6; }
22c937
  else
22c937
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
22c937
! $as_echo "no; xim has been disabled" >&6; }; enable_xim = "no"
22c937
  fi
22c937
  rm -f conftest*
22c937
  
22c937
--- 9303,9309 ----
22c937
  $as_echo "yes" >&6; }
22c937
  else
22c937
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5
22c937
! $as_echo "no; xim has been disabled" >&6; }; enable_xim="no"
22c937
  fi
22c937
  rm -f conftest*
22c937
  
22c937
*** ../vim-7.4.254/src/version.c	2014-04-10 11:09:11.684036810 +0200
22c937
--- src/version.c	2014-04-10 19:56:55.272105974 +0200
22c937
***************
22c937
*** 736,737 ****
22c937
--- 736,739 ----
22c937
  {   /* Add new patch number below this line */
22c937
+ /**/
22c937
+     255,
22c937
  /**/
22c937
22c937
-- 
22c937
hundred-and-one symptoms of being an internet addict:
22c937
40. You tell the cab driver you live at
22c937
    http://123.elm.street/house/bluetrim.html
22c937
41. You actually try that 123.elm.street address.
22c937
22c937
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
22c937
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
22c937
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
22c937
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///