summaryrefslogtreecommitdiffstats
path: root/src/auto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-24 21:31:54 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-24 21:31:54 +0100
commit16435480f0f41372585b3d305a29b5fda8271fbc (patch)
tree58170ee3d8d842aafc3ea8d442894819da27c19c /src/auto
parent2e2301437cb5cd4782fa031ea36dea086b9bd804 (diff)
patch 7.4.1172v7.4.1172
Problem: Configure is overly positive. Solution: Insert "test".
Diffstat (limited to 'src/auto')
-rwxr-xr-xsrc/auto/configure10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/auto/configure b/src/auto/configure
index 7ba3cc4528..dfe46cae05 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 :