aboutsummaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2018-07-17 18:50:04 -0700
committerGitHub <noreply@github.com>2018-07-17 18:50:04 -0700
commitd85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch)
tree6224f98ad30e99dc2d896423853892f2142f16ed /autogen.sh
parent22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff)
parent8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff)
downloadprotobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz
protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2
protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/autogen.sh b/autogen.sh
index 580714b9..d00d2172 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,6 +28,11 @@ fi
set -ex
+# The absence of a m4 directory in googletest causes autoreconf to fail when
+# building under the CentOS docker image. It's a warning in regular build on
+# Ubuntu/gLinux as well.
+mkdir -p third_party/googletest/m4
+
# TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings.
autoreconf -f -i -Wall,no-obsolete