jkunstle / rpms / vim

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