patch 7.4.1172
Problem: Configure is overly positive.
Solution: Insert "test".
diff --git a/src/auto/configure b/src/auto/configure
index 7ba3cc4..dfe46ca 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7249,11 +7249,17 @@
{ $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 90a17ac..e9ffa7b 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1950,14 +1950,14 @@
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 094d520..0c4ff91 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1172,
+/**/
1171,
/**/
1170,