patch 7.4.1320

Problem:    Building with Cygwin or MingW with channel but without Netbeans
            doesn't work.
Solution:   Set NETBEANS to "no" when not used.

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 026c966bfe8d482696a37eae93caffe3dc626639..28d31d6120481a016125d1e63b75abe39f62a7ef 100644 (file)
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -679,8 +679,10 @@ ifneq ($(CHANNEL),yes)
 # Cannot use Netbeans without CHANNEL
 NETBEANS=no
 else
-# Only allow NETBEANS for a GUI build.
-ifeq (yes, $(GUI))
+ifneq (yes, $(GUI))
+# Cannot use Netbeans without GUI.
+NETBEANS=no
+else
 OBJ += $(OUTDIR)/netbeans.o
 LIB += -lwsock32
 endif

diff --git a/src/version.c b/src/version.c
index c047848fa8084e401d167679cf501a1b13b6333c..a380ed3410de3993ae66516f2b3699a4a444bc0b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1320,
 /**/
     1319,
 /**/