Merge pull request #1011 from zeitounator/wrong-version-reported
Wrong version reported (1.7.0 should be 1.8.0)
This commit is contained in:
		
						commit
						4126de54a7
					
				@ -1,7 +1,7 @@
 | 
			
		||||
m4_include(../googletest/m4/acx_pthread.m4)
 | 
			
		||||
 | 
			
		||||
AC_INIT([Google C++ Mocking Framework],
 | 
			
		||||
        [1.7.0],
 | 
			
		||||
        [1.8.0],
 | 
			
		||||
        [googlemock@googlegroups.com],
 | 
			
		||||
        [gmock])
 | 
			
		||||
 | 
			
		||||
@ -101,7 +101,7 @@ AC_ARG_VAR([GTEST_VERSION],
 | 
			
		||||
           [The version of Google Test available.])
 | 
			
		||||
HAVE_BUILT_GTEST="no"
 | 
			
		||||
 | 
			
		||||
GTEST_MIN_VERSION="1.7.0"
 | 
			
		||||
GTEST_MIN_VERSION="1.8.0"
 | 
			
		||||
 | 
			
		||||
AS_IF([test "x${enable_external_gtest}" = "xyes"],
 | 
			
		||||
      [# Begin filling in variables as we are able.
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@ m4_include(m4/acx_pthread.m4)
 | 
			
		||||
# "[1.0.1]"). It also asumes that there won't be any closing parenthesis
 | 
			
		||||
# between "AC_INIT(" and the closing ")" including comments and strings.
 | 
			
		||||
AC_INIT([Google C++ Testing Framework],
 | 
			
		||||
        [1.7.0],
 | 
			
		||||
        [1.8.0],
 | 
			
		||||
        [googletestframework@googlegroups.com],
 | 
			
		||||
        [gtest])
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user