Permalink
Browse files

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

Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
  • Loading branch information...
liujisi committed Mar 12, 2018
2 parents 8e44a86 + cab5eae commit 478751903ab6ee34d52ace35b6f2620ea417f33f
Showing with 487 additions and 400 deletions.
  1. +2 −3 configure.ac
  2. +0 −397 m4/acx_pthread.m4
  3. +485 −0 m4/ax_pthread.m4
View
@@ -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
Oops, something went wrong.

0 comments on commit 4787519

Please sign in to comment.