diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-09 00:22:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 00:22:32 -0500 |
| commit | 0e6da4cead72ab739171bbe98570da971c3283b6 (patch) | |
| tree | 99a678b6b6fe1c8bc76e14287a9b7026c03019b7 /googlemock/configure.ac | |
| parent | cdedd189b22a6578e935256294175b9884e3cf17 (diff) | |
| parent | e194f52114a181cb3fb420d58d5ae2250207e828 (diff) | |
| download | googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.gz googletest-0e6da4cead72ab739171bbe98570da971c3283b6.tar.bz2 googletest-0e6da4cead72ab739171bbe98570da971c3283b6.zip | |
Merge branch 'master' into fix-core-dump-shared
Diffstat (limited to 'googlemock/configure.ac')
| -rw-r--r-- | googlemock/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/configure.ac b/googlemock/configure.ac index c23ed455..cb5e1a6a 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -129,7 +129,7 @@ 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 environment and # in a shell script environment, so resolve an absolute path for it here. GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config" |