commit 39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae
author Simon Newton <nomis52@gmail.com> Thu Sep 17 08:33:43 2015 -0700
committer Simon Newton <nomis52@gmail.com> Thu Sep 17 08:33:43 2015 -0700
tree 9f346d9bfb4c5769d59159ef812c7c00edeecd33
parent de411c3e80120f8dcc2a3f4f62f3ca692c0431d7

Fix the googlemock autotools build.

googlemock/configure.ac

diff --git a/googlemock/configure.ac b/googlemock/configure.ac
index d268d5d..3b740f2 100644
--- a/googlemock/configure.ac
+++ b/googlemock/configure.ac
@@ -1,4 +1,4 @@
-m4_include(gtest/m4/acx_pthread.m4)
+m4_include(../googletest/m4/acx_pthread.m4)
 
 AC_INIT([Google C++ Mocking Framework],
         [1.7.0],
@@ -129,14 +129,14 @@
       GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
       GTEST_LIBS=`${GTEST_CONFIG} --libs`
       GTEST_VERSION=`${GTEST_CONFIG} --version`],
-      [AC_CONFIG_SUBDIRS([gtest])
+      [AC_CONFIG_SUBDIRS([../googletest])
       # GTEST_CONFIG needs to be executable both in a Makefile environmont and
       # in a shell script environment, so resolve an absolute path for it here.
-      GTEST_CONFIG="`pwd -P`/gtest/scripts/gtest-config"
-      GTEST_CPPFLAGS='-I$(top_srcdir)/gtest/include'
+      GTEST_CONFIG="`pwd -P`/../googletest/scripts/gtest-config"
+      GTEST_CPPFLAGS='-I$(top_srcdir)/../googletest/include'
       GTEST_CXXFLAGS='-g'
       GTEST_LDFLAGS=''
-      GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la'
+      GTEST_LIBS='$(top_builddir)/../googletest/lib/libgtest.la'
       GTEST_VERSION="${GTEST_MIN_VERSION}"])
 
 # TODO(chandlerc@google.com) Check the types, structures, and other compiler