Merge pull request #1824 from rubenk/protobuf-autoconf