diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2015-11-17 10:18:49 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-18 11:58:19 -0500 |
| commit | 1745f7eae9bc206ffeb47d63dcdfa039ef3774e8 (patch) | |
| tree | 94c3b61e4b025c453c949c45255c5681914c799b /configure.ac | |
| parent | 8162451b727e5abd46ea934a81d44c6ff7e0963e (diff) | |
| download | protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.gz protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.tar.bz2 protobuf-1745f7eae9bc206ffeb47d63dcdfa039ef3774e8.zip | |
Add support for the conformance test for objc when run on OS X
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 0e587893..42605ae3 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ AC_LANG([C++]) ACX_USE_SYSTEM_EXTENSIONS m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc +AC_PROG_OBJC # test_util.cc takes forever to compile with GCC and optimization turned on. AC_MSG_CHECKING([C++ compiler flags...]) @@ -163,6 +164,15 @@ case "$target_os" in ;; esac +# Enable ObjC support for conformance directory on OS X. +OBJC_CONFORMANCE_TEST=0 +case "$target_os" in + darwin*) + OBJC_CONFORMANCE_TEST=1 + ;; +esac +AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) + # 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. |