From 3c4ec7e1d2fd0197c5fcadac7dd35414b7be72cb Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 20 Mar 2017 08:57:20 -0700
Subject: [PATCH] Fix problem with out-of-date dependencies

Problem reported by Robert Marshall in:
http://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00501.html
Although this problem has been with us for a while, the recent
change from Automake to GNU Make exposed it again.
* configure.ac (AUTO_DEPEND): When autodepending, clean out any
leftover dependency and object files, since the previous sources'
dependencies may disagree with the current ones.  Reconfiguring
typically needs to force a rebuild anyway.
---
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index b922dc473d6..48fcb3f33aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1742,6 +1742,9 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
    AC_MSG_RESULT([$ac_enable_autodepend])
    if test $ac_enable_autodepend = yes; then
       AUTO_DEPEND=yes
+      for depdir in */deps; do
+	test ! -d "$depdir" || rm -fr "$depdir"/../*.o "$depdir" || exit
+      done
    fi
 fi
 AC_SUBST(AUTO_DEPEND)
-- 
2.11.4.GIT