diff options
author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-05 20:18:53 +0000 |
---|---|---|
committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-05 20:18:53 +0000 |
commit | abe61de6e62aecbdf342204a89c56b03f3e45745 (patch) | |
tree | 438890edd73b02bf7277d2c5abaf6b3db136198a /configure.ac | |
parent | 91e32ac64dc63417ca5ce81475f88e85994aacf3 (diff) | |
download | protobuf-abe61de6e62aecbdf342204a89c56b03f3e45745.tar.gz protobuf-abe61de6e62aecbdf342204a89c56b03f3e45745.tar.bz2 protobuf-abe61de6e62aecbdf342204a89c56b03f3e45745.zip |
make changes to pass Cygwin
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 06b716d3..62ece151 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"], AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([subdir-objects]) AC_ARG_WITH([zlib], [AS_HELP_STRING([--with-zlib], @@ -46,6 +46,7 @@ AC_PROG_CC AC_PROG_CXX AC_LANG([C++]) ACX_USE_SYSTEM_EXTENSIONS +AM_PROG_AR AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc # test_util.cc takes forever to compile with GCC and optimization turned on. |