X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Finclude.am;h=41328568ff76fe1906ecd2191bcf92b29b8f1e34;hb=9a7cf6f7bc04b7baf17b801b80d1677b67fc859d;hp=98319e1e528bc5ab86e7c9002826fda2770c2b77;hpb=2569efffe16042f47dc5d2c34528a9ec22fc18b0;p=awesomized%2Flibmemcached

diff --git a/clients/include.am b/clients/include.am
index 98319e1e..41328568 100644
--- a/clients/include.am
+++ b/clients/include.am
@@ -6,10 +6,6 @@ CLIENTS_LDADDS=
 CLIENTS_LDADDS+= clients/libutilities.la
 CLIENTS_LDADDS+= libmemcached/libmemcached.la
 
-if HAVE_SASL
-CLIENTS_LDADDS+= $(LIBSASL)
-endif
-
 bin_PROGRAMS+= clients/memcapable 
 bin_PROGRAMS+= clients/memcat 
 bin_PROGRAMS+= clients/memcp 
@@ -83,9 +79,9 @@ clients_memerror_LDADD= $(CLIENTS_LDADDS)
 
 clients_memslap_SOURCES = clients/memslap.cc
 clients_memslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memslap_CXXFLAGS = ${PTHREAD_CFLAGS}
+clients_memslap_CXXFLAGS= @PTHREAD_CFLAGS@
 clients_memslap_LDADD= $(CLIENTS_LDADDS)
-clients_memslap_LDADD+= $(PTHREAD_LIBS)
+clients_memslap_LDADD+= @PTHREAD_LIBS@
 
 clients_memaslap_SOURCES=
 clients_memaslap_SOURCES+= clients/memaslap.c 
@@ -97,17 +93,21 @@ clients_memaslap_SOURCES+= clients/ms_task.c
 clients_memaslap_SOURCES+= clients/ms_thread.c
 
 clients_memaslap_SOURCES+= clients/generator.cc clients/execute.cc
-clients_memaslap_LDADD= $(LTLIBEVENT) $(CLIENTS_LDADDS)
+clients_memaslap_LDADD=
+clients_memaslap_LDADD+= @LIBEVENT_LIB@
+clients_memaslap_LDADD+= $(CLIENTS_LDADDS)
 
+clients_memcapable_CXXFLAGS= @PTHREAD_CFLAGS@
 clients_memcapable_SOURCES=
 clients_memcapable_SOURCES+= clients/memcapable.cc
 clients_memcapable_SOURCES+= libmemcached/byteorder.cc
 clients_memcapable_LDADD= $(CLIENTS_LDADDS)
+clients_memcapable_LDADD+= @PTHREAD_LIBS@
 
 test-start-server:
 	clients/memflush --servers=localhost
 	clients/memcp --servers=localhost /etc/services
-	clients/memcat --servers=localhost /etc/services
+	clients/memcat --servers=localhost services
 	clients/memrm --servers=localhost /etc/services
 	clients/memstat --servers=localhost
 	clients/memslap --servers=localhost