protobuf-c and osm2pgsql build updates.