An attempt to make dibbler build on OS x 12.3.0
Merge branch 'osx-build' of https://github.com/thorsager/dibbler
Minor tweaks after Michael's Mac OS X patch