summaryrefslogtreecommitdiffstats
path: root/googlemock/configure.ac
diff options
context:
space:
mode:
authorSimon Newton <nomis52@gmail.com>2015-09-17 15:33:43 (GMT)
committerSimon Newton <nomis52@gmail.com>2015-09-17 15:33:43 (GMT)
commit39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae (patch)
tree9f346d9bfb4c5769d59159ef812c7c00edeecd33 /googlemock/configure.ac
parentde411c3e80120f8dcc2a3f4f62f3ca692c0431d7 (diff)
downloadgoogletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.zip
googletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.tar.gz
googletest-39062f4e3005cac0b919d3dbe83b3d1e6b61a8ae.tar.bz2
Fix the googlemock autotools build.refs/pull/589/head
Diffstat (limited to 'googlemock/configure.ac')
-rw-r--r--googlemock/configure.ac10
1 files changed, 5 insertions, 5 deletions
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 @@ 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([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