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 b77b7e8ae0d1457a6ff0b173f875d5ebda852c93..1d20ec1af1837f0e6228ef3f1a7ca4b2dcbc0ece 100644 (file)
--- 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 38361cebe007cf9bd4c80b774f0216f10caa5df9..0930a7b4d0613c7788e5a5283013e39348c53f78 100644 (file)
--- 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,
 /**/