More fiddling with the automake stuff.