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

[m6w6/libmemcached] / libmemcached / include.am

diff --git a/libmemcached/include.am b/libmemcached/include.am
index f3525df2cf50fe69e8c1e5db34f7d502f7faf342..e230267ef49091bff28fa7ffbf22bce09338db28 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -16,6 +16,7 @@ nobase_include_HEADERS+= libmemcached/util.h
 noinst_HEADERS+= libmemcached/array.h 
 noinst_HEADERS+= libmemcached/assert.hpp 
 noinst_HEADERS+= libmemcached/backtrace.hpp 
+noinst_HEADERS+= libmemcached/behavior.hpp
 noinst_HEADERS+= libmemcached/byteorder.h 
 noinst_HEADERS+= libmemcached/common.h 
 noinst_HEADERS+= libmemcached/connect.hpp 
@@ -64,7 +65,6 @@ libmemcached_libmemcached_la_SOURCES+= libmemcached/array.c
 libmemcached_libmemcached_la_SOURCES+= libmemcached/auto.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/backtrace.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.cc
-libmemcached_libmemcached_la_SOURCES+= libmemcached/behavior.hpp
 libmemcached_libmemcached_la_SOURCES+= libmemcached/byteorder.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/callback.cc
 libmemcached_libmemcached_la_SOURCES+= libmemcached/connect.cc
@@ -115,12 +115,12 @@ libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
+libmemcached_libmemcached_la_LDFLAGS+= @DL_LIB@
 
 if HAVE_SASL
-libmemcached_libmemcached_la_CXXFLAGS+= $(LIBSASL_CPPFLAGS)
-libmemcached_libmemcached_la_CXXFLAGS+= $(PTHREAD_CFLAGS)
-libmemcached_libmemcached_la_LIBADD+= $(PTHREAD_LIBS)
-libmemcached_libmemcached_la_LIBADD+= $(LIBSASL_LDFLAGS)
+libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@
+libmemcached_libmemcached_la_LIBADD+= @PTHREAD_LIBS@
+libmemcached_libmemcached_la_LIBADD+= @SASL_LDFLAGS@
 endif
 
 if HAVE_DTRACE