projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in version/etc libtest
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index fcca1fd77691abfe989c3007dc933ba46a70ec36..a71e3369c23bf5e537edb5c57cf999a4e25d3c2c 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-52,10
+52,12
@@
AC_SUBST(MEMCACHED_LIBRARY_VERSION)
HASHKIT_LIBRARY_VERSION=1:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
HASHKIT_LIBRARY_VERSION=1:0:0
AC_SUBST(HASHKIT_LIBRARY_VERSION)
-AC_DEFINE([HAVE_LIBMEMCACHED], [ 1 ], [dummy rule for libtest])
-AC_SUBST(HAVE_LIBMEMCACHED, 1)
-AM_CONDITIONAL(HAVE_LIBMEMCACHED, true)
LT_INIT
LT_INIT
+AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
+AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
+
+AM_CONDITIONAL(BUILDING_GEARMAN, false)
+AM_CONDITIONAL(HAVE_LIBGEARMAN, false)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
@@
-75,11
+77,9
@@
ENABLE_HSIEH_HASH
ENABLE_MURMUR_HASH
ENABLE_MEMASLAP
PROTOCOL_BINARY_TEST
ENABLE_MURMUR_HASH
ENABLE_MEMASLAP
PROTOCOL_BINARY_TEST
-WITH_MEMCACHED
ENABLE_DEPRECATED
PANDORA_HAVE_LIBINNODB
PANDORA_HAVE_SASL
ENABLE_DEPRECATED
PANDORA_HAVE_LIBINNODB
PANDORA_HAVE_SASL
-WITH_LIBGEARMAN
AC_CHECK_FUNCS([alarm])
AC_CHECK_FUNCS([dup2])
AC_CHECK_FUNCS([alarm])
AC_CHECK_FUNCS([dup2])
@@
-160,6
+160,7
@@
AC_CONFIG_FILES([
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec
+ libtest/version.h
])
AC_OUTPUT
])
AC_OUTPUT