diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 18:21:48 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-06-15 18:24:01 -0700 |
| commit | e96ff30120a3834f7d1e31e43e591bf7cfbd731f (patch) | |
| tree | 7e4c317912ac3809fbff11bb692084debd4a27eb /configure.ac | |
| parent | 4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff) | |
| download | protobuf-e96ff30120a3834f7d1e31e43e591bf7cfbd731f.tar.gz protobuf-e96ff30120a3834f7d1e31e43e591bf7cfbd731f.tar.bz2 protobuf-e96ff30120a3834f7d1e31e43e591bf7cfbd731f.zip | |
Down-integrate from internal code base.
[ci skip]
Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 8018cc75..764e5d43 100644 --- a/configure.ac +++ b/configure.ac @@ -157,12 +157,12 @@ case "$target_os" in ;; esac -# 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 +# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, +# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock # too. export CFLAGS export CXXFLAGS -AC_CONFIG_SUBDIRS([gtest]) +AC_CONFIG_SUBDIRS([gmock]) AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) AC_OUTPUT |