Mercurial > vim
changeset 7342:b871e4bdb319 v7.4.976
commit https://github.com/vim/vim/commit/8def26a0f5f5535e9af64e715cb80845fc8ec322
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Dec 17 15:34:53 2015 +0100
patch 7.4.976
Problem: When compiling Vim for MSYS2 (linked with msys-2.0.dll), the Win32
clipboard is not enabled.
Solution: Recognize MSYS like CYGWIN. (Ken Takata)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 17 Dec 2015 15:45:04 +0100 |
parents | c61a87f9e679 |
children | 15ed2b29c224 |
files | src/auto/configure src/configure.in src/version.c |
diffstat | 3 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -9501,10 +9501,10 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN environment" >&5 -$as_echo_n "checking for CYGWIN environment... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 +$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; } case `uname` in - CYGWIN*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 $as_echo_n "checking for CYGWIN clipboard support... " >&6; }
--- a/src/configure.in +++ b/src/configure.in @@ -2792,9 +2792,9 @@ dnl end of GUI-checking dnl --------------------------------------------------------------------------- dnl Check for Cygwin, which needs an extra source file if not using X11 -AC_MSG_CHECKING(for CYGWIN environment) +AC_MSG_CHECKING(for CYGWIN or MSYS environment) case `uname` in - CYGWIN*) CYGWIN=yes; AC_MSG_RESULT(yes) + CYGWIN*|MSYS*) CYGWIN=yes; AC_MSG_RESULT(yes) AC_MSG_CHECKING(for CYGWIN clipboard support) if test "x$with_x" = "xno" ; then OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o