diff options
| author | Conor Burgess <Burgess.Conor@gmail.com> | 2018-01-12 16:00:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 16:00:39 +0000 |
| commit | 27bb844e5c31a0a67b7b4864ffb2b80ae2803882 (patch) | |
| tree | e8cca8f555358fa2ed590a226c8a15a0354dbd80 /googlemock/configure.ac | |
| parent | 8f90d46c8cdd743759821a1c987a70e826d58cef (diff) | |
| parent | ed8d02cfc689f26b65e6deb585561c59615b05de (diff) | |
| download | googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.gz googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.tar.bz2 googletest-27bb844e5c31a0a67b7b4864ffb2b80ae2803882.zip | |
Merge branch 'master' into fix-argc
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" |