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 /src/Makefile.am | |
| parent | 4cbb612299eaf8259db25f5dcda46022fbd1db54 (diff) | |
| parent | 78d470c7a50d3788bf3f819eba99597aea43674f (diff) | |
Merge pull request #497 from pherl/config_h
Check HAVE_CONFIG_H before including "config.h"
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ac6ec6f4..67cd4c57 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,17 +4,25 @@ if HAVE_ZLIB GZCHECKPROGRAMS = zcgzip zcgunzip GZHEADERS = google/protobuf/io/gzip_stream.h GZTESTS = google/protobuf/io/gzip_stream_unittest.sh +ZLIB_DEF = -DHAVE_ZLIB=1 else GZCHECKPROGRAMS = GZHEADERS = GZTESTS = +ZLIB_DEF = +endif + +if HAVE_PTHREAD +PTHREAD_DEF = -DHAVE_PTHREAD=1 +else +PTHREAD_DEF = endif if GCC # These are good warnings to turn on by default -NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare +NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare else -NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) +NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) endif AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG) |