diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-02-24 17:21:37 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-02-24 17:21:37 +0000 |
| commit | 5905ba00fe78e522f7253e837ded3ddb5b946934 (patch) | |
| tree | 9cf0d4111261e046ac1fb23673a9c2a8563d2613 /configure.ac | |
| parent | 470df42bad6a78531f0ec51e43a194f3e26c4f4d (diff) | |
| download | googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.tar.gz googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.tar.bz2 googletest-5905ba00fe78e522f7253e837ded3ddb5b946934.zip | |
Adds threading support (by Vlad Losev); updates the version number (by Zhanyong Wan); adds release notes for 1.5.0 (by Vlad Losev).
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 25ab6f36..8498a6c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,7 @@ +m4_include(gtest/m4/acx_pthread.m4) + AC_INIT([Google C++ Mocking Framework], - [1.4.0], + [1.5.0], [googlemock@googlegroups.com], [gmock]) @@ -35,6 +37,25 @@ AM_CONDITIONAL([HAVE_PYTHON],[test "$PYTHON" != ":"]) # TODO(chandlerc@google.com) Check for the necessary system headers. +# Configure pthreads. +AC_ARG_WITH([pthreads], + [AS_HELP_STRING([--with-pthreads], + [use pthreads (default is yes)])], + [with_pthreads=$withval], + [with_pthreads=check]) + +have_pthreads=no +AS_IF([test "x$with_pthreads" != "xno"], + [ACX_PTHREAD( + [], + [AS_IF([test "x$with_pthreads" != "xcheck"], + [AC_MSG_FAILURE( + [--with-pthreads was specified, but unable to be used])])]) + have_pthreads="$acx_pthread_ok"]) +AM_CONDITIONAL([HAVE_PTHREADS],[test "x$have_pthreads" == "xyes"]) +AC_SUBST(PTHREAD_CFLAGS) +AC_SUBST(PTHREAD_LIBS) + # GoogleMock currently has hard dependencies upon GoogleTest above and beyond # running its own test suite, so we both provide our own version in # a subdirectory and provide some logic to use a custom version or a system @@ -80,7 +101,7 @@ AC_ARG_VAR([GTEST_VERSION], [The version of Google Test available.]) HAVE_BUILT_GTEST="no" -GTEST_MIN_VERSION="1.4.0" +GTEST_MIN_VERSION="1.5.0" AS_IF([test "x${enable_external_gtest}" = "xyes"], [# Begin filling in variables as we are able. |