3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-03-10 17:36:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes config_aux to build-aux to conform with the convention. Simplifies the configuration commands in README. By Chandler Carruth.

Browse Source
This commit is contained in:
shiqian 2008-12-10 05:45:40 +00:00
parent fab8c18a00
commit a369436e2a
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README
View File

@ -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 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 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) 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. $ ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 autoreconf -fiv
$ libtoolize -c # Use "glibtoolize -c" instead on Mac OS X.
$ autoheader
$ automake-1.9 -ac # See Automake version requirements above.
$ autoconf
While this is a bit complicated, it will most often be automatically re-run by You can substitute newer versions of 'aclocal' and 'automake', but be aware
your "make" invocations, so in practice you shouldn't need to worry too much. that older versions are known not to work, and autoreconf may or may not
Once you have completed these steps, you are ready to build the library. 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: ### ### Source Package: ###
Google Test is also released in source packages which can be downloaded from Google Test is also released in source packages which can be downloaded from

0
config_aux/.keep → build-aux/.keep
View File

5
configure.ac
View File

@ -10,8 +10,8 @@ AC_INIT([Google C++ Testing Framework],
# Provide various options to initialize the Autoconf and configure processes. # Provide various options to initialize the Autoconf and configure processes.
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_CONFIG_SRCDIR([./COPYING]) AC_CONFIG_SRCDIR([./COPYING])
AC_CONFIG_AUX_DIR([config_aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config_aux/config.h]) AC_CONFIG_HEADERS([build-aux/config.h])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([scripts/gtest-config], [chmod +x scripts/gtest-config]) 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 # 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" # version to be >= 2.3. This will allow the scripts to use a "/usr/bin/env"
# hashbang. # hashbang.
#AM_PATH_PYTHON([2.3],,[:])
PYTHON= # We *do not* allow the user to specify a python interpreter PYTHON= # We *do not* allow the user to specify a python interpreter
AC_PATH_PROG([PYTHON],[python],[:]) AC_PATH_PROG([PYTHON],[python],[:])
AS_IF([test "$PYTHON" != ":"], AS_IF([test "$PYTHON" != ":"],