Merge pull request #3504 from pherl/3.4.x

Prefer system distributed binaries/libraries.
8 years ago · fdb5cd5e4b
parent fa46d11e2e 98c6d04df4
commit fdb5cd5e4b
1 changed files with 3 additions and 0 deletions
--- a/python/release/wheel/protobuf_optimized_pip.sh
+++ b/python/release/wheel/protobuf_optimized_pip.sh
@ -47,6 +47,9 @@ cd $DIR/protobuf-${PROTOBUF_VERSION}
 sed -i '/AC_PROG_OBJC/d' configure.ac
 sed -i 's/conformance\/Makefile//g' configure.ac

+# Use the /usr/bin/autoconf and related tools to pick the correct aclocal macros
+export PATH="/usr/bin:$PATH"
+
 # Build protoc
 ./autogen.sh
 CXXFLAGS="-fPIC -g -O2" ./configure