From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 24 Jan 2016 20:31:54 +0000 (+0100)
Subject: patch 7.4.1172
X-Git-Tag: v7.4.1172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16435480f0f41372585b3d305a29b5fda8271fbc;p=vim

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

diff --git a/src/auto/configure b/src/auto/configure
index 7ba3cc452..dfe46cae0 100755
--- 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
 fi
 
-if test "$enable_netbeans" = "yes" -o "$enable_channel" = "yes"; then
+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
index 90a17ac84..e9ffa7bb1 100644
--- 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
index 094d520dd..0c4ff914d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1172,
 /**/
     1171,
 /**/