Thrift: Re-committing zlib.
Summary:
Same as the last (reverted) zlib patch,
but this time with way more awesome support for building
with no zlib headers installed.
Reviewed By: mcslee
Test Plan:
- Did lots of really pathological stuff in my VMware.
- On devrs004:
./bootstrap.sh && ./configure && make && make install DESTDIR=/tmp/tzinst && echo "Yay"
Revert Plan: ok
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665269 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index b80bcc3..7b1f1b0 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -4,11 +4,14 @@
if AMX_HAVE_LIBEVENT
lib_LTLIBRARIES += libthriftnb.la
endif
+if AMX_HAVE_ZLIB
+lib_LTLIBRARIES += libthriftz.la
+endif
common_cxxflags = -Wall -Isrc $(BOOST_CPPFLAGS)
common_ldflags = -Wall $(BOOST_LDFLAGS)
-# Define the source file for the module
+# Define the source files for the module
libthrift_la_SOURCES = src/Thrift.cpp \
src/reflection_limited_types.cpp \
@@ -32,11 +35,21 @@
src/server/TThreadedServer.cpp \
src/processor/PeekProcessor.cpp
-
libthriftnb_la_SOURCES = src/server/TNonblockingServer.cpp
+libthriftz_la_SOURCES = src/transport/TZlibTransport.cpp
+
+
+# Flags for the various libraries
+
libthrift_la_CXXFLAGS = $(common_cxxflags)
-libthriftnb_la_CXXFLAGS = $(common_cxxflags) $(LIBEVENT_CPPFLAGS)
+
+libthriftnb_la_CXXFLAGS = $(common_cxxflags)
+libthriftnb_la_CPPFLAGS = $(LIBEVENT_CPPFLAGS)
+
+libthriftz_la_CXXFLAGS = $(common_cxxflags)
+libthriftz_la_CPPFLAGS = $(ZLIB_CPPFLAGS)
+
include_thriftdir = $(includedir)/thrift
include_thrift_HEADERS = \
@@ -76,7 +89,8 @@
src/transport/TSocketPool.h \
src/transport/TTransport.h \
src/transport/TTransportException.h \
- src/transport/TTransportUtils.h
+ src/transport/TTransportUtils.h \
+ src/transport/TZlibTransport.h
include_serverdir = $(include_thriftdir)/server
include_server_HEADERS = \