diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-05-22 14:54:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-05-22 14:54:26 +0200 |
| commit | e09ef6797e268242ce225c35bd908a99d991b6eb (patch) | |
| tree | d5ae52478e75ceeb42e53e335c94bf6dd1717ff0 | |
| parent | ed85b758fff25fe1db4347c7b04c8fcae4ba37e0 (diff) | |
| download | vim-e09ef6797e268242ce225c35bd908a99d991b6eb.tar.gz | |
Problem: The way config.cache is removed doesn't always work.
Solution: Always remove config.cache. (Ken Takata)
| -rw-r--r-- | src/Makefile | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile index b77b7e8a..1d20ec1a 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 38361ceb..0930a7b4 100644 --- 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, |