diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-02-17 18:23:41 -0800 |
commit | cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9 (patch) | |
tree | e7e5dd284e2384dfaf1f8eff0eb2f3feab944872 /configure.ac | |
parent | f473bb9903370cc9324b0881873e0d0861f5d325 (diff) | |
download | protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.gz protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.tar.bz2 protobuf-cb3caf1e61126fd18fa63e2a0e91bf71ab4ac3c9.zip |
Integrate changes from Google open-source branch.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d1fde9d5..b68468e4 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,7 @@ AC_PROG_CC AC_PROG_CXX AC_LANG([C++]) ACX_USE_SYSTEM_EXTENSIONS -AM_PROG_AR +m4_ifdef([AM_PROG_AR], [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. |