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

[m6w6/libmemcached] / libmemcachedprotocol / include.am

diff --git a/libmemcachedprotocol/include.am b/libmemcachedprotocol/include.am
index 33d00fe9a4407b033b28c6cc0f9bf769ab76dfa8..dd350f5ad3ccee7ed0d61cb4a71eaa9519af25e3 100644 (file)
--- a/libmemcachedprotocol/include.am
+++ b/libmemcachedprotocol/include.am
@@ -22,13 +22,15 @@ libmemcached_libmemcachedprotocol_la_CFLAGS=
 libmemcached_libmemcachedprotocol_la_CFLAGS+= ${AM_CFLAGS}
 libmemcached_libmemcachedprotocol_la_CFLAGS+= ${NO_CONVERSION}
 libmemcached_libmemcachedprotocol_la_CFLAGS+= -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CFLAGS+= @PTHREAD_CFLAGS@
 
 libmemcached_libmemcachedprotocol_la_CXXFLAGS=
 libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${AM_CXXFLAGS}
 libmemcached_libmemcachedprotocol_la_CXXFLAGS+= -DBUILDING_LIBMEMCACHED
-libmemcached_libmemcachedprotocol_la_CXXFLAGS+= ${PTHREAD_CFLAGS}
+libmemcached_libmemcachedprotocol_la_CXXFLAGS+= @PTHREAD_CFLAGS@
 
-libmemcached_libmemcachedprotocol_la_LIBADD= ${PTHREAD_LIBS}
+libmemcached_libmemcachedprotocol_la_LIBADD=
+libmemcached_libmemcachedprotocol_la_LIBADD+= @LIBEVENT_LDFLAGS@
+libmemcached_libmemcachedprotocol_la_LIBADD+= @PTHREAD_LIBS@
 libmemcached_libmemcachedprotocol_la_LDFLAGS= ${AM_LDFLAGS}
 libmemcached_libmemcachedprotocol_la_LDFLAGS+= -version-info ${MEMCACHED_PROTOCAL_LIBRARY_VERSION}