Index: driver/Makefile.in
===================================================================
--- driver/Makefile.in	(revision 50d529e85d1a5459e49e34f4152ba5ca5e471ff6)
+++ driver/Makefile.in	(revision bcadb2610b960fb4c21a1ced4f5d40079c84f8c3)
@@ -101,5 +101,5 @@
 	$(top_srcdir)/automake/ltversion.m4 \
 	$(top_srcdir)/automake/lt~obsolete.m4 \
-	$(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/tools/build/cfa.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -203,4 +203,5 @@
 CFACC_INSTALL = @CFACC_INSTALL@
 CFACPP = @CFACPP@
+CFAMAKE = @CFAMAKE@
 CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@