diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-12-10 05:45:40 (GMT) |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-12-10 05:45:40 (GMT) |
| commit | a369436e2adb3f27fa5b169b85f14c56fcdc6f5b (patch) | |
| tree | 0e241e961c0750890fe42b30ca052430e2318323 | |
| parent | fab8c18a0059fdd0938652d19f2e58fbb2582649 (diff) | |
| download | googletest-a369436e2adb3f27fa5b169b85f14c56fcdc6f5b.zip googletest-a369436e2adb3f27fa5b169b85f14c56fcdc6f5b.tar.gz googletest-a369436e2adb3f27fa5b169b85f14c56fcdc6f5b.tar.bz2 | |
Changes config_aux to build-aux to conform with the convention. Simplifies the configuration commands in README. By Chandler Carruth.
| -rw-r--r-- | README | 17 | ||||
| -rw-r--r-- | build-aux/.keep (renamed from config_aux/.keep) | 0 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 10 insertions, 12 deletions
@@ -77,17 +77,16 @@ or for a release version X.Y.*'s branch: Next you will need to prepare the GNU Autotools build system, if you are using Linux, Mac OS X, or Cygwin. Enter the target directory of the checkout command you used ('gtest-svn' or 'gtest-X.Y-svn' above) -and proceed with the following commands: +and proceed with the following command to bootstrap the build system: - $ aclocal-1.9 # Where "1.9" must match the following automake command. - $ libtoolize -c # Use "glibtoolize -c" instead on Mac OS X. - $ autoheader - $ automake-1.9 -ac # See Automake version requirements above. - $ autoconf + $ ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 autoreconf -fiv -While this is a bit complicated, it will most often be automatically re-run by -your "make" invocations, so in practice you shouldn't need to worry too much. -Once you have completed these steps, you are ready to build the library. +You can substitute newer versions of 'aclocal' and 'automake', but be aware +that older versions are known not to work, and autoreconf may or may not +correctly detect the required version. Also, the versions must match for both +commands. However, this entire process will be automatically re-run by your +"make" invocations, so in practice you shouldn't need to worry too much. Once +you have completed these steps, you are ready to build the library. ### Source Package: ### Google Test is also released in source packages which can be downloaded from diff --git a/config_aux/.keep b/build-aux/.keep index e69de29..e69de29 100644 --- a/config_aux/.keep +++ b/build-aux/.keep diff --git a/configure.ac b/configure.ac index bb21a60..14a354b 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ AC_INIT([Google C++ Testing Framework], # Provide various options to initialize the Autoconf and configure processes. AC_PREREQ([2.59]) AC_CONFIG_SRCDIR([./COPYING]) -AC_CONFIG_AUX_DIR([config_aux]) -AC_CONFIG_HEADERS([config_aux/config.h]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([build-aux/config.h]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config]) @@ -31,7 +31,6 @@ AC_PROG_LIBTOOL # HAVE_PYTHON by requiring "python" to be in the PATH, and that interpreter's # version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env" # hashbang. -#AM_PATH_PYTHON([2.3],,[:]) PYTHON= # We *do not* allow the user to specify a python interpreter AC_PATH_PROG([PYTHON],[python],[:]) AS_IF([test "$PYTHON" != ":"], |