diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-20 13:02:58 -0800 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-01-20 13:12:29 -0800 |
| commit | afb4b72037e3f13db208590fc782c4bc8e27f862 (patch) | |
| tree | 204041a6b0ac0941d14faa2afe222d1b4b627db9 /m4 | |
| parent | 80aff29bb2d37977a02c0a677721522d3467a4d9 (diff) | |
| download | external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.zip external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.gz external_protobuf-afb4b72037e3f13db208590fc782c4bc8e27f862.tar.bz2 | |
Upgrade protobuf library to v2.6.1.
The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:
git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1
and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".
Reran ./configure && make -j12 check to regenerate configure script
and makefiles.
Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/acx_check_suncc.m4 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/m4/acx_check_suncc.m4 b/m4/acx_check_suncc.m4 index 4e8f961..8918593 100644 --- a/m4/acx_check_suncc.m4 +++ b/m4/acx_check_suncc.m4 @@ -42,6 +42,7 @@ AC_DEFUN([ACX_CHECK_SUNCC],[ AS_IF([test "x$ac_enable_64bit" = "xyes"],[ + AC_DEFINE([SOLARIS_64BIT_ENABLED], [1], [64bit enabled]) AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[ dnl The user hasn't overridden the default libdir, so we'll dnl the dir suffix to match solaris 32/64-bit policy |