diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-01-03 17:06:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 17:06:31 -0500 |
| commit | a5014476f0c49c966e4ac602469cddefc7ed486d (patch) | |
| tree | b60d37f8eb4f03a02bfeb113822ba1dfb6862e79 /googlemock/configure.ac | |
| parent | ba6ecedede74521490f36b6aea08f91fdad6d201 (diff) | |
| parent | 26addade175b5d576eee788719367719d235350f (diff) | |
| download | googletest-a5014476f0c49c966e4ac602469cddefc7ed486d.tar.gz googletest-a5014476f0c49c966e4ac602469cddefc7ed486d.tar.bz2 googletest-a5014476f0c49c966e4ac602469cddefc7ed486d.zip | |
Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule
Run autoconf from top-level directory.
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" |