RELENG-235: more work to attempt to get './configure && make' working again
RELENG-235: more work to attempt to get './configure && make' working again

joyent/mountain-gorilla,joyent/mountain-gorilla,joyent/mountain-gorilla