From 98c6d04df4325dcf7c3c83b25879df9fc8c9b9d3 Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Wed, 16 Aug 2017 12:57:12 -0700
Subject: Prefer system distributed binaries/libraries.

It seems like the image has a /usr/local/bin/autoconf installed, which
doesn't recognize/work with the yum installed libtools. Putting
distributed binaries/libraries first solves the problem
---
 python/release/wheel/protobuf_optimized_pip.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'python')

diff --git a/python/release/wheel/protobuf_optimized_pip.sh b/python/release/wheel/protobuf_optimized_pip.sh
index 469661aa..064d1d2a 100755
--- 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
-- 
cgit v1.2.3