Skip to content

Commit 67830d2

Browse files
authored
Merge pull request protocolbuffers#1333 from cgull/pkg-config-issue
Replace ancient m4/acx_pthread.m4 with m4/ax_pthread.m4
2 parents f009357 + cab5eae commit 67830d2

File tree

3 files changed

+487
-400
lines changed

3 files changed

+487
-400
lines changed

configure.ac

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,8 @@ AS_IF([test "$with_protoc" != "no"], [
184184
])
185185
AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
186186

187-
ACX_PTHREAD
188-
AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
189-
187+
AX_PTHREAD
188+
AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
190189
# We still keep this for improving pbconfig.h for unsupported platforms.
191190
AC_CXX_STL_HASH
192191

0 commit comments

Comments
 (0)