diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-04 10:13:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 10:13:00 -0500 |
| commit | 4216f869f77bc3733ccf734f2941fd3a601d0077 (patch) | |
| tree | 5c66bb3d15a199fb2057f775592aaa1ade2edf34 /googlemock | |
| parent | 1c09831acc69d6d77af5d5aa45feee6f52dc1a76 (diff) | |
| parent | a5014476f0c49c966e4ac602469cddefc7ed486d (diff) | |
| download | googletest-4216f869f77bc3733ccf734f2941fd3a601d0077.tar.gz googletest-4216f869f77bc3733ccf734f2941fd3a601d0077.tar.bz2 googletest-4216f869f77bc3733ccf734f2941fd3a601d0077.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock')
| -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" |