diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-21 21:00:39 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-04-21 21:00:39 +0000 |
| commit | 37ad00d2c4409b4b3d629e1b0ae32bb814cec740 (patch) | |
| tree | 17a6af5bb668de01220cecfa9cebb0c9ab55dfe9 /configure.ac | |
| parent | a6de64aef3e75dd0e0b2540280037139ef3d0066 (diff) | |
| download | protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.tar.gz protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.tar.bz2 protobuf-37ad00d2c4409b4b3d629e1b0ae32bb814cec740.zip | |
Update bundled gtest to latest version (1.3.0) and include it as a
nested autoconf package rather than as raw source. This way we can
trivially update it again in the future.
Actually, this change doesn't even include gtest in protobuf's SVN.
Instead, we auto-download it when autogen.sh is invoked. Note that
it will be included in release distributions, though.
TODO:
* Add a configure option to use the system's installed gtest rather
than the bundled copy. Apparently the gtest maintainers are working
on some general-purpose autoconf macros which will do this
automagically.
* Update MSVC project files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2824960b..fe46c352 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,11 @@ AC_PREREQ(2.59) # * python/setup.py # * src/google/protobuf/stubs/common.h # * src/Makefile.am (Update -version-info for LDFLAGS if needed) -AC_INIT([protobuf],[2.0.4-SNAPSHOT],[protobuf@googlegroups.com]) +# +# In the SVN trunk, the version should always be the next anticipated release +# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed +# the size of one file name in the dist tarfile over the 99-char limit.) +AC_INIT([Protocol Buffers],[2.0.4-pre],[protobuf@googlegroups.com],[protobuf]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) AC_CONFIG_HEADERS([config.h]) @@ -23,6 +27,7 @@ AC_ARG_WITH([zlib], # Checks for programs. AC_PROG_CC AC_PROG_CXX +AC_LANG([C++]) ACX_USE_SYSTEM_EXTENSIONS AC_PROG_LIBTOOL AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc @@ -56,5 +61,7 @@ AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1]) ACX_PTHREAD AC_CXX_STL_HASH +AC_CONFIG_SUBDIRS([gtest]) + AC_CONFIG_FILES([Makefile src/Makefile ]) AC_OUTPUT |