Mercurial > vim

changeset 5917:1157079ca5f1 v7.4.300

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.300 Problem: The way config.cache is removed doesn't always work. Solution: Always remove config.cache. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Thu, 22 May 2014 14:54:26 +0200
parents 2e4330207871
children 0c43318e476a
files src/Makefile src/version.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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" \
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    300,
+/**/
     299,
 /**/
     298,