waiting on my machine to arrive as I commit this.

The patch in the other branch, mbair42_wip, is obsolete,
because I took the build system changes of that and split
them up into smaller changes, that were suitable already for
master.

so this patch now is just the config!