Merge "Revert "Fix configure errors for newer Automake versions""