diff src/auto/configure @ 7749:3a1b60f5e89b v7.4.1172

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".
author Christian Brabandt <cb@256bit.org>
date Sun, 24 Jan 2016 21:45:05 +0100
parents 6069f43cea4e
children 0ee0c7729f28
line wrap: on
line diff
--- 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 :