diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
| commit | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/configure.ac | |
| parent | 555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff) | |
| parent | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff) | |
| download | googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2 googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip | |
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
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" |