projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in patch for additional lib for SASL
[m6w6/libmemcached]
/
clients
/
include.am
diff --git
a/clients/include.am
b/clients/include.am
index 028d3b93b12aa977f58ffcb1e88b9ca548898745..a709e38df6c979e6f28a4657e500a8a4b6bfd6b7 100644
(file)
--- a/
clients/include.am
+++ b/
clients/include.am
@@
-3,9
+3,14
@@
# All paths should be given relative to the root
CLIENTS_LDADDS = \
# All paths should be given relative to the root
CLIENTS_LDADDS = \
+ $(LIBM) \
clients/libutilities.la \
libmemcached/libmemcached.la
clients/libutilities.la \
libmemcached/libmemcached.la
+if HAVE_SASL
+CLIENTS_LDADDS+= $(LIBSASL)
+endif
+
bin_PROGRAMS+= \
clients/memcapable \
clients/memcat \
bin_PROGRAMS+= \
clients/memcapable \
clients/memcat \
@@
-17,8
+22,10
@@
bin_PROGRAMS+= \
clients/memstat
if HAVE_LIBEVENT
clients/memstat
if HAVE_LIBEVENT
+if !BUILD_WIN32_WRAPPERS
bin_PROGRAMS+= clients/memslap
endif
bin_PROGRAMS+= clients/memslap
endif
+endif
noinst_HEADERS+= \
clients/client_options.h \
noinst_HEADERS+= \
clients/client_options.h \
@@
-69,11
+76,12
@@
clients_memslap_SOURCES= \
clients/ms_stats.c \
clients/ms_task.c \
clients/ms_thread.c
clients/ms_stats.c \
clients/ms_task.c \
clients/ms_thread.c
-clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
-lm
+clients_memslap_LDADD= $(LTLIBEVENT) clients/libgenexec.la $(CLIENTS_LDADDS)
clients_memcapable_SOURCES= clients/memcapable.c
clients_memcapable_SOURCES= clients/memcapable.c
+clients_memcapable_LDADD= $(CLIENTS_LDADDS)
if BUILD_BYTEORDER
if BUILD_BYTEORDER
-clients_memcapable_LDADD= libmemcached/libbyteorder.la
+clients_memcapable_LDADD
+
= libmemcached/libbyteorder.la
endif
test-start-server:
endif
test-start-server: