out of tree build fixes

[David Bremner]

David Bremner <david at tethera.net> writes:

> Apparently we've neglected the out of tree builds even more than
> usual. I originally thought this is what was causing the test failures
> on buildbot. I'm less sure now, but I think these fixes don't hurt
> anything, and they do unbreak out of tree builds for me.

Yeah, turns out the buildbot failures are bad prereq checking in the
tests.

Pushed this (revised) series anyway.

d