Merge pull request protocolbuffers#1333 from cgull/pkg-config-issue

Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
Faire · Mar 12, 2018 · 4787519 · 4787519
2 parents 8e44a86 + cab5eae
commit 4787519
Show file tree

Hide file tree

Showing 3 changed files with 487 additions and 400 deletions.
diff --git a/configure.ac b/configure.ac
@@ -184,9 +184,8 @@ AS_IF([test "$with_protoc" != "no"], [
 ])
 AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
 
-ACX_PTHREAD
-AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
-
+AX_PTHREAD
+AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
 # We still keep this for improving pbconfig.h for unsupported platforms.
 AC_CXX_STL_HASH