This abuild is untouched since 2014. All the later changes are from mass
changes across repository.

and fixed misc build issues

fixes #9