diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-12-10 20:56:13 -0800 |
| commit | 52909485d15a9ac617bc8948c02dafd1ab4233bd (patch) | |
| tree | b0d60d94523b828c077bfe47f30ce0e70c01f267 /configure.ac | |
| parent | 261fe97a63316a4a4918afcaa6c8c0f4b0da45fc (diff) | |
| parent | 8d5d7cc6d03b00fcb7162525100fbd4cc0d1929d (diff) | |
Merge branch v3.0.0-alpha-1 into master.
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ee85c155..263118b5 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) # 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.6.2-pre],[protobuf@googlegroups.com],[protobuf]) +AC_INIT([Protocol Buffers],[3.0.0-alpha-1],[protobuf@googlegroups.com],[protobuf]) AM_MAINTAINER_MODE([enable]) @@ -22,7 +22,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)]) case "$DIST_LANG" in - "") DIST_LANG=cpp ;; + "") DIST_LANG=all ;; all | cpp | java | python | javanano | ruby) ;; *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;; esac |