diff options
author | Jisi Liu <liujisi@google.com> | 2015-06-16 19:12:25 -0700 |
---|---|---|
committer | Jisi Liu <liujisi@google.com> | 2015-06-16 19:12:25 -0700 |
commit | b36395b2bac88f70070544c325bc09234cb1f1a6 (patch) | |
tree | f2d0c53ce1a94234cc4994ea319f1560f44b2f96 /configure.ac | |
parent | 4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff) | |
parent | 78d470c7a50d3788bf3f819eba99597aea43674f (diff) | |
download | protobuf-b36395b2bac88f70070544c325bc09234cb1f1a6.tar.gz protobuf-b36395b2bac88f70070544c325bc09234cb1f1a6.tar.bz2 protobuf-b36395b2bac88f70070544c325bc09234cb1f1a6.zip |
Merge pull request #497 from pherl/config_h
Check HAVE_CONFIG_H before including "config.h"
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8018cc75..b36fa0c0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,9 @@ AC_INIT([Protocol Buffers],[3.0.0-alpha-4-pre],[protobuf@googlegroups.com],[prot AM_MAINTAINER_MODE([enable]) AC_CONFIG_SRCDIR(src/google/protobuf/message.cc) +# The config file is generated but not used by the source code, since we only +# need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are +# passed down in CXXFLAGS manually in src/Makefile.am AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -146,6 +149,9 @@ AS_IF([test "$with_protoc" != "no"], [ AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"]) ACX_PTHREAD +AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"]) + +# We still keep this for improving pbconfig.h for unsupported platforms. AC_CXX_STL_HASH case "$target_os" in |