From 240fe5a0cf84258c9baf288b78debd3a4b709913 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Fri, 5 Jun 2009 06:42:33 +0000 Subject: [PATCH] Fixes errors in the autotools scripts. --- configure.ac | 2 +- scripts/gmock-config.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c317979f..78ff30d8 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ AC_ARG_VAR([GTEST_VERSION], [The version of Google Test available.]) HAVE_BUILT_GTEST="no" -GTEST_MIN_VERSION="1.2.1" +GTEST_MIN_VERSION="1.3.0" AS_IF([test "x${enable_external_gtest}" = "xyes"], [# Begin filling in variables as we are able. diff --git a/scripts/gmock-config.in b/scripts/gmock-config.in index 016ad611..9ce17a25 100755 --- a/scripts/gmock-config.in +++ b/scripts/gmock-config.in @@ -259,7 +259,7 @@ fi # Add the necessary Google Test bits into the various flag variables gmock_cppflags="${gmock_cppflags} `${gtest_config} --cppflags`" gmock_cxxflags="${gmock_cxxflags} `${gtest_config} --cxxflags`" -gmock_ldflags="${gmock_ldflags}`${gtest_config} --ldflags`" +gmock_ldflags="${gmock_ldflags} `${gtest_config} --ldflags`" gmock_libs="${gmock_libs} `${gtest_config} --libs`" # Do an installation query if requested.