X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=28456b59129422146442be9038fa22320b39ebba;hb=3e87de62b0b39279bdec62a07b45e42fe798fd41;hp=425cec0b87d4aaf771da785ff1a57333a3accc37;hpb=b77f874c7d7ff386d01eeedb44c14d3003354bae;p=m6w6%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 425cec0b..28456b59 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -31,6 +31,7 @@ noinst_HEADERS+= \
 		 libmemcached/protocol/binary_handler.h \
 		 libmemcached/protocol/common.h \
 		 libmemcached/response.h \
+		 libmemcached/server.hpp \
 		 libmemcached/server_instance.h \
 		 libmemcached/string.hpp \
 		 libmemcached/virtual_bucket.h
@@ -82,15 +83,9 @@ nobase_include_HEADERS+= \
 			 libmemcached/watchpoint.h
 
 lib_LTLIBRARIES+= libmemcached/libmemcached.la
-libmemcached_libmemcached_la_CFLAGS= \
-				     ${AM_CFLAGS} \
-				     ${NO_CONVERSION} \
-				     -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CFLAGS= -DBUILDING_LIBMEMCACHED
 
-libmemcached_libmemcached_la_CXXFLAGS= \
-				       ${AM_CXXFLAGS} \
-				       ${NO_CONVERSION} \
-				       -DBUILDING_LIBMEMCACHED
+libmemcached_libmemcached_la_CXXFLAGS= -DBUILDING_LIBMEMCACHED
 
 libmemcached_libmemcached_la_SOURCES+= \
 				       ${libhashkit_libhashkit_la_SOURCES} \
@@ -139,10 +134,14 @@ libmemcached/options.cc: libmemcached/csl/parser.h
 
 libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD= $(LIBM)
-libmemcached_libmemcached_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
+libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
 
 libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
 libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
+if HAVE_SASL
+libmemcached_libmemcached_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcached_la_LIBADD+= ${PTHREAD_LIBS}
+endif
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h