diff options
| author | Jisi Liu <liujisi@google.com> | 2018-03-12 14:13:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 14:13:13 -0700 |
| commit | 478751903ab6ee34d52ace35b6f2620ea417f33f (patch) | |
| tree | 21caff38f14c8316628b8305ce237426a94144dd /configure.ac | |
| parent | 8e44a86facd0f42af7a3c0c47f8133f78f037269 (diff) | |
| parent | cab5eae3e0dc8cc13d06b8d94bf4759d14e1c20e (diff) | |
| download | protobuf-478751903ab6ee34d52ace35b6f2620ea417f33f.tar.gz protobuf-478751903ab6ee34d52ace35b6f2620ea417f33f.tar.bz2 protobuf-478751903ab6ee34d52ace35b6f2620ea417f33f.zip | |
Merge pull request #1333 from cgull/pkg-config-issue
Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index faa1cdc3..4e3dc613 100644 --- 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 |