| OLD | NEW |
| 1 AC_INIT([Google C++ Mocking Framework], | 1 AC_INIT([Google C++ Mocking Framework], |
| 2 [1.1.0], | 2 [1.1.0], |
| 3 [googlemock@googlegroups.com], | 3 [googlemock@googlegroups.com], |
| 4 [gmock]) | 4 [gmock]) |
| 5 | 5 |
| 6 # Provide various options to initialize the Autoconf and configure processes. | 6 # Provide various options to initialize the Autoconf and configure processes. |
| 7 AC_PREREQ([2.59]) | 7 AC_PREREQ([2.59]) |
| 8 AC_CONFIG_SRCDIR([./COPYING]) | 8 AC_CONFIG_SRCDIR([./COPYING]) |
| 9 AC_CONFIG_AUX_DIR([build-aux]) | 9 AC_CONFIG_AUX_DIR([build-aux]) |
| 10 AC_CONFIG_HEADERS([build-aux/config.h]) | 10 AC_CONFIG_HEADERS([build-aux/config.h]) |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 AC_ARG_VAR([GTEST_CXXFLAGS], | 73 AC_ARG_VAR([GTEST_CXXFLAGS], |
| 74 [C++ compile flags for Google Test.]) | 74 [C++ compile flags for Google Test.]) |
| 75 AC_ARG_VAR([GTEST_LDFLAGS], | 75 AC_ARG_VAR([GTEST_LDFLAGS], |
| 76 [Linker path and option flags for Google Test.]) | 76 [Linker path and option flags for Google Test.]) |
| 77 AC_ARG_VAR([GTEST_LIBS], | 77 AC_ARG_VAR([GTEST_LIBS], |
| 78 [Library linking flags for Google Test.]) | 78 [Library linking flags for Google Test.]) |
| 79 AC_ARG_VAR([GTEST_VERSION], | 79 AC_ARG_VAR([GTEST_VERSION], |
| 80 [The version of Google Test available.]) | 80 [The version of Google Test available.]) |
| 81 HAVE_BUILT_GTEST="no" | 81 HAVE_BUILT_GTEST="no" |
| 82 | 82 |
| 83 GTEST_MIN_VERSION="1.2.1" | 83 GTEST_MIN_VERSION="1.3.0" |
| 84 | 84 |
| 85 AS_IF([test "x${enable_external_gtest}" = "xyes"], | 85 AS_IF([test "x${enable_external_gtest}" = "xyes"], |
| 86 [# Begin filling in variables as we are able. | 86 [# Begin filling in variables as we are able. |
| 87 AS_IF([test "x${with_gtest}" != "xyes"], | 87 AS_IF([test "x${with_gtest}" != "xyes"], |
| 88 [AS_IF([test -x "${with_gtest}/scripts/gtest-config"], | 88 [AS_IF([test -x "${with_gtest}/scripts/gtest-config"], |
| 89 [GTEST_CONFIG="${with_gtest}/scripts/gtest-config"], | 89 [GTEST_CONFIG="${with_gtest}/scripts/gtest-config"], |
| 90 [GTEST_CONFIG="${with_gtest}/bin/gtest-config"]) | 90 [GTEST_CONFIG="${with_gtest}/bin/gtest-config"]) |
| 91 AS_IF([test -x "${GTEST_CONFIG}"], [], | 91 AS_IF([test -x "${GTEST_CONFIG}"], [], |
| 92 [AC_MSG_ERROR([dnl | 92 [AC_MSG_ERROR([dnl |
| 93 Unable to locate either a built or installed Google Test at '${with_gtest}'.]) | 93 Unable to locate either a built or installed Google Test at '${with_gtest}'.]) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 116 GTEST_CXXFLAGS='-g' | 116 GTEST_CXXFLAGS='-g' |
| 117 GTEST_LDFLAGS='' | 117 GTEST_LDFLAGS='' |
| 118 GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la' | 118 GTEST_LIBS='$(top_builddir)/gtest/lib/libgtest.la' |
| 119 GTEST_VERSION="${GTEST_MIN_VERSION}"]) | 119 GTEST_VERSION="${GTEST_MIN_VERSION}"]) |
| 120 | 120 |
| 121 # TODO(chandlerc@google.com) Check the types, structures, and other compiler | 121 # TODO(chandlerc@google.com) Check the types, structures, and other compiler |
| 122 # and architecture characteristics. | 122 # and architecture characteristics. |
| 123 | 123 |
| 124 # Output the generated files. No further autoconf macros may be used. | 124 # Output the generated files. No further autoconf macros may be used. |
| 125 AC_OUTPUT | 125 AC_OUTPUT |
| OLD | NEW |