073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.300
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.300
073263
Problem:    The way config.cache is removed doesn't always work.
073263
Solution:   Always remove config.cache. (Ken Takata)
073263
Files:	    src/Makefile
073263
073263
073263
*** ../vim-7.4.299/src/Makefile	2014-04-29 20:04:05.331539784 +0200
073263
--- src/Makefile	2014-05-22 14:48:23.034475967 +0200
073263
***************
073263
*** 1664,1675 ****
073263
  # auto/config.h isn't updated.  The dependency on auto/config.mk should make
073263
  # sure configure is run when it's needed.
073263
  #
073263
  config auto/config.mk: auto/configure config.mk.in config.h.in
073263
! 	if test -f auto/config.cache && \
073263
! 	    grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
073263
! 	    ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
073263
! 		rm auto/config.cache; \
073263
! 	fi
073263
  	if test "X$(MAKECMDGOALS)" != "Xclean" \
073263
  		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
073263
  		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
073263
--- 1664,1674 ----
073263
  # auto/config.h isn't updated.  The dependency on auto/config.mk should make
073263
  # sure configure is run when it's needed.
073263
  #
073263
+ # Remove the config.cache every time, once in a while it causes problems that
073263
+ # are very hard to figure out.
073263
+ #
073263
  config auto/config.mk: auto/configure config.mk.in config.h.in
073263
! 	-rm -f auto/config.cache
073263
  	if test "X$(MAKECMDGOALS)" != "Xclean" \
073263
  		-a "X$(MAKECMDGOALS)" != "Xdistclean" \
073263
  		-a "X$(MAKECMDGOALS)" != "Xautoconf" \
073263
*** ../vim-7.4.299/src/version.c	2014-05-22 14:44:08.098481148 +0200
073263
--- src/version.c	2014-05-22 14:51:36.022472045 +0200
073263
***************
073263
*** 736,737 ****
073263
--- 736,739 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     300,
073263
  /**/
073263
073263
073263
-- 
073263
What is the difference between a professional and an amateur?
073263
The ark was built by an amateur; professionals gave us the Titanic.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///