automake-1.10 fixes (SF#1791361: https://sourceforge.net/tracker/index.php?func=detai...