Fixes from unity-stage since June/06

This madness is because the mac build agents sometimes have glibtoolize and sometimes have libtoolize, and sometimes have an ancient libtool in a place that mismatches the installed [g]libtoolize...