# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1453668305 -3600
# Node ID 3a1b60f5e89b78e8d1fc16964943fc9957a89f2d
# Parent  6f4650e5c4cc702a94abbee32eb2a1e7091f6a19
commit https://github.com/vim/vim/commit/16435480f0f41372585b3d305a29b5fda8271fbc
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jan 24 21:31:54 2016 +0100

    patch 7.4.1172
    Problem:    Configure is overly positive.
    Solution:   Insert "test".

diff --git a/src/auto/configure b/src/auto/configure
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7249,11 +7249,17 @@ if test "$enable_channel" = "yes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+  if test "$enable_netbeans" = "yes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, netbeans also disabled" >&5
+$as_echo "yes, netbeans also disabled" >&6; }
+    enable_netbeans="no"
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-fi
-
-if test "$enable_netbeans" = "yes" -o "$enable_channel" = "yes"; then
+  fi
+fi
+
+if test "$enable_channel" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
 $as_echo_n "checking for socket in -lsocket... " >&6; }
 if ${ac_cv_lib_socket_socket+:} false; then :
diff --git a/src/configure.in b/src/configure.in
--- a/src/configure.in
+++ b/src/configure.in
@@ -1950,14 +1950,14 @@ if test "$enable_channel" = "yes"; then
   AC_MSG_RESULT(no)
 else
   if test "$enable_netbeans" = "yes"; then
-    AC_MSG_RESULT(yes, netbeans also disabled)
+    AC_MSG_RESULT([yes, netbeans also disabled])
     enable_netbeans="no"
   else
     AC_MSG_RESULT(yes)
   fi
 fi
 
-if "$enable_channel" = "yes"; then
+if test "$enable_channel" = "yes"; then
   dnl On Solaris we need the socket and nsl library.
   AC_CHECK_LIB(socket, socket)
   AC_CHECK_LIB(nsl, gethostbyname)
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    1172,
+/**/
     1171,
 /**/
     1170,