X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Finclude.am;h=d5b2fc76de1d33847d272b0f5503b3a655cf5e57;hb=a3e65690104fce187003aa62d1f1f5c2edd11b17;hp=a10b92a5aa5363fcaeb67b252824d98c37834ba2;hpb=04a36d57ee3511224f08adb036dc3f4b2f85dadb;p=awesomized%2Flibmemcached

diff --git a/libmemcached/include.am b/libmemcached/include.am
index a10b92a5..d5b2fc76 100644
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -20,7 +20,6 @@ noinst_HEADERS+= \
 		 libmemcached/assert.hpp \
 		 libmemcached/backtrace.hpp \
 		 libmemcached/byteorder.h \
-		 libmemcached/close_socket.hpp \
 		 libmemcached/common.h \
 		 libmemcached/connect.hpp \
 		 libmemcached/continuum.hpp \
@@ -39,8 +38,10 @@ noinst_HEADERS+= \
 		 libmemcached/namespace.h \
 		 libmemcached/options.hpp \
 		 libmemcached/response.h \
+		 libmemcached/sasl.hpp \
 		 libmemcached/server.hpp \
 		 libmemcached/server_instance.h \
+		 libmemcached/socket.hpp \
 		 libmemcached/string.hpp \
 		 libmemcached/udp.hpp \
 		 libmemcached/virtual_bucket.h \
@@ -88,7 +89,7 @@ libmemcached_libmemcached_la_SOURCES+= \
 				       libmemcached/quit.hpp \
 				       libmemcached/response.cc \
 				       libmemcached/result.cc \
-				       libmemcached/sasl.hpp \
+				       libmemcached/sasl.cc \
 				       libmemcached/server.cc \
 				       libmemcached/server_list.cc \
 				       libmemcached/server_list.hpp \
@@ -110,11 +111,11 @@ libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 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}
+libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
+libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
+libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
 endif
 
 if HAVE_DTRACE