diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-17 15:34:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-17 15:34:53 +0100 |
| commit | 8def26a0f5f5535e9af64e715cb80845fc8ec322 (patch) | |
| tree | 62d08928afc65ae0adcbeff1061705c345c50652 | |
| parent | 75e3ad019933f4879137775549261bf51985ab7d (diff) | |
| download | vim-git-7.4.976.tar.gz | |
patch 7.4.976v7.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)
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/auto/configure b/src/auto/configure index 0564b9f3a..7e1d76dcf 100755 --- 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; } diff --git a/src/configure.in b/src/configure.in index 3934f88c5..7b901d828 100644 --- 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 diff --git a/src/version.c b/src/version.c index f7a4a2045..e034d450f 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 976, +/**/ 975, /**/ 974, |