diff options
author | Carlos O'Ryan <coryan@users.noreply.github.com> | 2017-12-03 14:07:35 -0500 |
---|---|---|
committer | Carlos O'Ryan <coryan@users.noreply.github.com> | 2017-12-03 14:07:35 -0500 |
commit | aea8580ecf448bc9d783181996139cae60ce44c9 (patch) | |
tree | 66fb79b90b978a99fc3e3118eefe65a68bce6a8f /googlemock | |
parent | 247a3d8e5e5d403f7fcacdb8ccc71e5059f15daa (diff) | |
download | googletest-aea8580ecf448bc9d783181996139cae60ce44c9.tar.gz googletest-aea8580ecf448bc9d783181996139cae60ce44c9.tar.bz2 googletest-aea8580ecf448bc9d783181996139cae60ce44c9.zip |
Run autoconf from top-level directory.
This is part (hopefully all) of the fixes for #776. The top-level
configure.ac configures googletest first and then googlemock.
With this changes it is possible to embed googletest into another
project that uses autoconf. For an example (though it is WIP), see
the commits (and soon PR) referenced from google/protobuf#236.
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" |