projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge for release
[m6w6/libmemcached]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a977a2c5fcbec6153aa9106baf212eaac471ee59..a548c9823be72f5bf9934a332cb0399c2444529e 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1,6
+1,6
@@
# vim:ft=automake
# vim:ft=automake
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
-I libtest/m4
# includes append to these:
SUFFIXES =
# includes append to these:
SUFFIXES =
@@
-31,8
+31,6
@@
EXTRA_DIST+= config/uncrustify.cfg
include libtest/include.am
include libtest/include.am
-libtest_libtest_la_DEPENDENCIES+= memcached/memcached
-
include libhashkit-1.0/include.am
include libmemcached-1.0/include.am
include libmemcachedprotocol-0.0/include.am
include libhashkit-1.0/include.am
include libmemcached-1.0/include.am
include libmemcachedprotocol-0.0/include.am
@@
-53,7
+51,11
@@
include support/include.am
include tests/include.am
include util/include.am
include win32/include.am
include tests/include.am
include util/include.am
include win32/include.am
+
+if HAVE_LIBEVENT
include memcached/include.am
include memcached/include.am
+libtest_libtest_la_DEPENDENCIES+= memcached/memcached
+endif
docs: html man
docs: html man