Merge branch 'maint'

* maint:
  Fix missing dependency files after 882564edf.
  config.cache could be a user file

.gitignore

@@ -1,6 +1,7 @@
 /Makefile
 /build/confcache
 /build/config.cache
+/config.cache
 /build/confdefs.h
 /src/config.h
 /build/config.log

Makefile.in

@@ -83,7 +83,7 @@ distclean: clean
 	@rm -rf *-$(VERSION)/ autom4te.cache/ autoscan.log configure.scan
 	@rm -rf src/.deps/ src/compat/.deps/ src/strucutres/.deps/ src/mod/*.mod/.deps/ src/crypto/.deps src/.defs/
 	-+@cd lib && $(MAKE) distclean
-	@rm -f $(STATICMAKEFILES) $(CONFIGFILES) config.h config.log config.status config.cache
+	@rm -f $(STATICMAKEFILES) $(CONFIGFILES) config.h config.log config.status
 
 
 distrib: clean

build/autotools/includes/depend.m4

@@ -59,7 +59,7 @@ for mf in $files; do
         rm -f "$dirpart/${base}.${suffix}"
       fi
     fi
-    echo "include .deps/$base.Po" >> "$dirpart/.deps/includes"
+    echo "include .${dirpart#${dirmf}}/.deps/$base.Po" >> "${dirmf}/.deps/includes"
   done
 done
 ])

configure

@@ -9189,7 +9189,7 @@ for mf in $files; do
         rm -f "$dirpart/${base}.${suffix}"
       fi
     fi
-    echo "include .deps/$base.Po" >> "$dirpart/.deps/includes"
+    echo "include .${dirpart#${dirmf}}/.deps/$base.Po" >> "${dirmf}/.deps/includes"
   done
 done