patch 7.4.1172

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

diff --git a/src/auto/configure b/src/auto/configure
index 7ba3cc452805b1c53f965572a6a7aa33ac52cdf6..dfe46cae052e575304bd3ecd79a17feb88366aac 100755 (executable)
--- 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 90a17ac847dfc992deb52cbbf9b6cdb7543f8de5..e9ffa7bb19263afbf08160c10e597d265a699864 100644 (file)
--- 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 094d520ddda4e0f50e5cbe7d2cd8007a17f34913..0c4ff914d25fc4b52c175c9f6979406539bc4820 100644 (file)
--- 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,
 /**/