Update to current gtest/gmock.

testing/gmock/configure.ac

+m4_include(gtest/m4/acx_pthread.m4)
+
 AC_INIT([Google C++ Mocking Framework],
-        [1.4.0],
+        [1.5.0],
         [googlemock@googlegroups.com],
         [gmock])
 
 # Provide various options to initialize the Autoconf and configure processes.
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([./COPYING])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([build-aux/config.h])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([scripts/gmock-config], [chmod +x scripts/gmock-config])
@@ skipping 15 matching lines @@
 # version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
 # hashbang.
 PYTHON=  # We *do not* allow the user to specify a python interpreter
 AC_PATH_PROG([PYTHON],[python],[:])
 AS_IF([test "$PYTHON" != ":"],
       [AM_PYTHON_CHECK_VERSION([$PYTHON],[2.3],[:],[PYTHON=":"])])
 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
 # installed version.
 AC_ARG_WITH([gtest],
             [AS_HELP_STRING([--with-gtest],
                             [Specifies how to find the gtest package. If no
                             arguments are given, the default behavior, a
                             system installed gtest will be used if present,
                             and an internal version built otherwise. If a
@@ skipping 25 matching lines @@
 AC_ARG_VAR([GTEST_CXXFLAGS],
            [C++ compile flags for Google Test.])
 AC_ARG_VAR([GTEST_LDFLAGS],
            [Linker path and option flags for Google Test.])
 AC_ARG_VAR([GTEST_LIBS],
            [Library linking flags for Google Test.])
 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.
       AS_IF([test "x${with_gtest}" != "xyes"],
             [AS_IF([test -x "${with_gtest}/scripts/gtest-config"],
                    [GTEST_CONFIG="${with_gtest}/scripts/gtest-config"],
                    [GTEST_CONFIG="${with_gtest}/bin/gtest-config"])
             AS_IF([test -x "${GTEST_CONFIG}"], [],
                   [AC_MSG_ERROR([dnl
 Unable to locate either a built or installed Google Test at '${with_gtest}'.])
@@ skipping 22 matching lines @@
       GTEST_CXXFLAGS='-g'
       GTEST_LDFLAGS=''
       GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la'
       GTEST_VERSION="${GTEST_MIN_VERSION}"])
 
 # TODO(chandlerc@google.com) Check the types, structures, and other compiler
 # and architecture characteristics.
 
 # Output the generated files. No further autoconf macros may be used.
 AC_OUTPUT