diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-08 12:19:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:04 -0700 |
| commit | 11f5a2740aa8a55d620fba6957e53ad08721cf54 (patch) | |
| tree | 04f982e6158e57f68529ca47e37ec377574647dd /googlemock/configure.ac | |
| parent | 008e54c1dd407b6edd680fccf78cd194365e0507 (diff) | |
| parent | 66bd580b5bc054522f7fab13463a47aa156a2d4b (diff) | |
| download | googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.gz googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.tar.bz2 googletest-11f5a2740aa8a55d620fba6957e53ad08721cf54.zip | |
Merge branch 'master' into cross-testing-patch-1
Diffstat (limited to 'googlemock/configure.ac')
| -rw-r--r-- | googlemock/configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/configure.ac b/googlemock/configure.ac index 3b740f20..cb5e1a6a 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -1,7 +1,7 @@ m4_include(../googletest/m4/acx_pthread.m4) AC_INIT([Google C++ Mocking Framework], - [1.7.0], + [1.8.0], [googlemock@googlegroups.com], [gmock]) @@ -101,7 +101,7 @@ AC_ARG_VAR([GTEST_VERSION], [The version of Google Test available.]) HAVE_BUILT_GTEST="no" -GTEST_MIN_VERSION="1.7.0" +GTEST_MIN_VERSION="1.8.0" AS_IF([test "x${enable_external_gtest}" = "xyes"], [# Begin filling in variables as we are able. @@ -129,8 +129,8 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"], GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags` GTEST_LIBS=`${GTEST_CONFIG} --libs` GTEST_VERSION=`${GTEST_CONFIG} --version`], - [AC_CONFIG_SUBDIRS([../googletest]) - # GTEST_CONFIG needs to be executable both in a Makefile environmont and + [ + # GTEST_CONFIG needs to be executable both in a Makefile environment and # in a shell script environment, so resolve an absolute path for it here. GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config" GTEST_CPPFLAGS='-I$(top_srcdir)/../googletest/include' |