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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0eb80202..8d7bb563 100644 --- a/Makefile.am +++ b/Makefile.am @@ -744,12 +744,9 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \ CONTRIBUTORS.txt \ CHANGES.txt \ cmake/CMakeLists.txt \ - cmake/config.h.in \ - cmake/find_hash_map.cmake \ cmake/libprotobuf.cmake \ cmake/libprotobuf-lite.cmake \ cmake/libprotoc.cmake \ - cmake/pbconfig.h.in \ cmake/protoc.cmake \ cmake/README.md \ cmake/tests.cmake \ |