Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188

[awesomized/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 74da20f08992136b0d56fd135143066c3fd28342..5ca9c27ca4aa38c36eadb2f5ad4886f9ac15f1f5 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -38,6 +38,7 @@ noinst_HEADERS+= libmemcached/memcached/vbucket.h
 noinst_HEADERS+= libmemcached/memory.h 
 noinst_HEADERS+= libmemcached/namespace.h 
 noinst_HEADERS+= libmemcached/options.hpp 
+noinst_HEADERS+= libmemcached/poll.h
 noinst_HEADERS+= libmemcached/response.h 
 noinst_HEADERS+= libmemcached/result.h
 noinst_HEADERS+= libmemcached/sasl.hpp 
@@ -90,6 +91,7 @@ libmemcached_libmemcached_la_SOURCES+= libmemcached/encoding_key.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/namespace.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/options.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/parse.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/poll.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/purge.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/quit.hpp
@@ -104,9 +106,9 @@ libmemcached_libmemcached_la_SOURCES+= libmemcached/storage.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/strerror.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/string.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/touch.cc
+libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/verbosity.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/version.cc
-libmemcached_libmemcached_la_SOURCES+= libmemcached/udp.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/virtual_bucket.c
 
 libmemcached/options.cc: libmemcached/csl/parser.h
@@ -115,12 +117,10 @@ libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION
 libmemcached_libmemcached_la_LIBADD+= @DL_LIB@
 
 if HAVE_SASL
-if HAVE_LIBSASL
 libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
 libmemcached_libmemcached_la_LIBADD+= @LIBSASL_LIB@
 endif
-endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h