Updated to build on OSX (will now require updated autoconf)