jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.255

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