diff options
| author | drgler <daniel.kruegler@gmail.com> | 2017-08-22 20:19:13 +0200 |
|---|---|---|
| committer | drgler <daniel.kruegler@gmail.com> | 2017-08-22 21:13:32 +0200 |
| commit | d93ce9d6fb8ea690239c69be6cbc58099a55ec13 (patch) | |
| tree | 65575eed9d0e5e39686efe40d530c45c00851b9d /googlemock/configure.ac | |
| parent | 6404d45a92528cb0a8f8294d4c0b057c23138de5 (diff) | |
| parent | 8304d06199bdfb13bfb7613db9b5231141300e25 (diff) | |
| download | googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.gz googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.tar.bz2 googletest-d93ce9d6fb8ea690239c69be6cbc58099a55ec13.zip | |
Merge branch 'master' of github.com:Dani-Hub/googletest
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 3b740f20..edfd8963 100644 --- a/googlemock/configure.ac +++ b/googlemock/configure.ac @@ -130,7 +130,7 @@ AS_IF([test "x${HAVE_BUILT_GTEST}" = "xyes"], 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' |