Merge in fixes for SASL.

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 4950f3ca6409e16313c8e323cb3e0834d3981859..425cec0b87d4aaf771da785ff1a57333a3accc37 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -141,10 +141,8 @@ libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD= $(LIBM)
 libmemcached_libmemcached_la_LDFLAGS+= ${AM_LDFLAGS} -version-info ${MEMCACHED_LIBRARY_VERSION}
 
-if HAVE_SASL
-libmemcached_libmemcached_la_LDFLAGS+= $(LTLIBSASL) $(LTLIBSASL2)
-libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.c
-endif
+libmemcached_libmemcached_la_LIBADD+= $(LTLIBSASL) $(LTLIBSASL2)
+libmemcached_libmemcached_la_SOURCES += libmemcached/sasl.cc
 
 if HAVE_DTRACE
 BUILT_SOURCES+= libmemcached/dtrace_probes.h