bug#17935: make check failed

[Ludovic Courtès]

I’ve reproduced the setup here, and found out a couple of issues, now
fixed with commits c2d7747, 6171070, and 59c51be.

I think we’re all set, but let me know if you encounter other problems!

Thanks,
Ludo’.