From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 22 May 2014 12:54:26 +0000 (+0200)
Subject: updated for version 7.4.300
X-Git-Tag: v7.4.300
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b129a5ac475a22a363e348be045932233c6d386;p=vim

updated for version 7.4.300
Problem:    The way config.cache is removed doesn't always work.
Solution:   Always remove config.cache. (Ken Takata)
---

diff --git a/src/Makefile b/src/Makefile
index b77b7e8ae..1d20ec1af 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1664,12 +1664,11 @@ tools: $(TOOLS)
 # auto/config.h isn't updated.  The dependency on auto/config.mk should make
 # sure configure is run when it's needed.
 #
+# Remove the config.cache every time, once in a while it causes problems that
+# are very hard to figure out.
+#
 config auto/config.mk: auto/configure config.mk.in config.h.in
-	if test -f auto/config.cache && \
-	    grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
-	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
-		rm auto/config.cache; \
-	fi
+	-rm -f auto/config.cache
 	if test "X$(MAKECMDGOALS)" != "Xclean" \
 		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
 		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
diff --git a/src/version.c b/src/version.c
index 38361cebe..0930a7b4d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    300,
 /**/
     299,
 /**/