diff options
| author | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-23 22:12:22 +0000 |
|---|---|---|
| committer | kenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2009-12-23 22:12:22 +0000 |
| commit | 45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9 (patch) | |
| tree | 9cdc3cd44f94c29b705708ab46cd6300751f9dfd /configure.ac | |
| parent | bf06bb24bcbe413c15b4b09a944bb8510e252a9a (diff) | |
| download | protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.tar.gz protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.tar.bz2 protobuf-45258ff4e23e3427b96bf3f36c393d1ac0c8f2e9.zip | |
Fix 32/64-bit confusion on Solaris 10 x86. Patch from Oliver Jowett.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index fa54431f..e7ceb002 100644 --- a/configure.ac +++ b/configure.ac @@ -138,8 +138,10 @@ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"]) ACX_PTHREAD AC_CXX_STL_HASH -# HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the -# flags added by ACX_CHECK_SUNCC must be used when compiling gtest too. +# HACK: Make gtest's configure script pick up our copy of CFLAGS and CXXFLAGS, +# since the flags added by ACX_CHECK_SUNCC must be used when compiling gtest +# too. +export CFLAGS export CXXFLAGS AC_CONFIG_SUBDIRS([gtest]) |