diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-04 22:01:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 22:01:38 -0500 |
| commit | 6b4967a23aae2f6d63a356d1db8746cb5250be26 (patch) | |
| tree | e76ee1c2169a9551829d8fce649d393474d8dd2e /googlemock/configure.ac | |
| parent | b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9 (diff) | |
| parent | abbc0f8174d92b8a52dd893cf31be6f7af5d0de7 (diff) | |
| download | googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.gz googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.tar.bz2 googletest-6b4967a23aae2f6d63a356d1db8746cb5250be26.zip | |
Merge branch 'master' into missing-declarations
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" |