projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix -1 usage for bad socket descriptor
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 5b71b30254f4ffb3d5c570100c525648e23a0aaf..602b4520bec8dc6bd55d44ea5f89808b9eb128ee 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-7,7
+7,7
@@
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[
0.5
2],[http://libmemcached.org/])
+AC_INIT([libmemcached],[
1.0.
2],[http://libmemcached.org/])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(config)
@@
-61,14
+61,13
@@
gl_VISIBILITY
m4_include([m4/memcached.m4])
m4_include([m4/memcached_sasl.m4])
m4_include([m4/gearmand.m4])
m4_include([m4/memcached.m4])
m4_include([m4/memcached_sasl.m4])
m4_include([m4/gearmand.m4])
+m4_include([m4/libgearman.m4])
AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
AM_CONDITIONAL(BUILDING_GEARMAN, false)
AM_CONDITIONAL(BUILDING_LIBMEMCACHED, true)
AM_CONDITIONAL(HAVE_LIBMEMCACHED, false)
AC_DEFINE([HAVE_LIBMEMCACHED], [1], [Enables libmemcached Support])
AM_CONDITIONAL(BUILDING_GEARMAN, false)
-AM_CONDITIONAL(HAVE_LIBGEARMAN, false)
-AC_DEFINE([HAVE_LIBGEARMAN], [0], [Enables libgearman Support])
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
@@
-92,6
+91,7
@@
ENABLE_UTILLIB
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
ENABLE_MURMUR_HASH
SETSOCKOPT_SANITY
ENABLE_HSIEH_HASH
ENABLE_MURMUR_HASH
+ENABLE_FNV64_HASH
ENABLE_MEMASLAP
PROTOCOL_BINARY_TEST
ENABLE_DEPRECATED
ENABLE_MEMASLAP
PROTOCOL_BINARY_TEST
ENABLE_DEPRECATED
@@
-127,6
+127,10
@@
AC_CHECK_HEADERS([netinet/in.h])
AC_CHECK_HEADERS([stddef.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sasl/sasl.h])
AC_CHECK_HEADERS([stddef.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sasl/sasl.h])
+AC_CHECK_HEADERS([execinfo.h])
+AC_CHECK_HEADERS([cxxabi.h],
+ AC_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
+ AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
AC_CXX_HEADER_STDCXX_98
AC_FUNC_ALLOCA
AC_CXX_HEADER_STDCXX_98
AC_FUNC_ALLOCA
@@
-148,6
+152,14
@@
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+AC_C_RESTRICT
+
+AX_CXX_GCC_ABI_DEMANGLE
+
dnl The sasl functions should only be visible if we build with sasl support
AS_IF([test "x$ac_cv_sasl" = "xyes"],
[
dnl The sasl functions should only be visible if we build with sasl support
AS_IF([test "x$ac_cv_sasl" = "xyes"],
[
@@
-182,8
+194,10
@@
SOCKET_SEND_FLAGS
AC_CONFIG_FILES([
Makefile
docs/conf.py
AC_CONFIG_FILES([
Makefile
docs/conf.py
- libhashkit/configure.h
- libmemcached/configure.h
+ libhashkit-1.0/configure.h
+ libmemcached-1.0/configure.h
+ libmemcached-1.2/configure.h
+ libmemcached-2.0/configure.h
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec
support/libmemcached.pc
support/libmemcached.spec
support/libmemcached-fc.spec