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 1.0.3
[m6w6/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 883fa3c4c9d7e9ce7f40cc203f74b7f49debb215..aa91153c1a8a8366b66e5137b29119b10b311b63 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,13
+1,13
@@
#!/usr/bin/env bash
# LibmemcacheD
#!/usr/bin/env bash
# LibmemcacheD
-# Copyright (C) 2011 Data Differential, http://datadifferential.com/
+# Copyright (C) 2011
-2012
Data Differential, http://datadifferential.com/
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# All rights reserved.
#
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
# All rights reserved.
#
# Use and distribution licensed under the BSD license. See
# the COPYING file in this directory for full text.
-AC_INIT([libmemcached],[1.0.
2
],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.
3
],[http://libmemcached.org/])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(config)
@@
-33,7
+33,7
@@
AC_CHECK_PROGS([LEX], ['flex'], [:])
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
#shared library versioning
MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=
8
:0:0
+MEMCACHED_LIBRARY_VERSION=
9
:0:0
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-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
@@
-154,6
+158,19
@@
AC_C_INLINE
AC_C_VOLATILE
AC_C_RESTRICT
AC_C_VOLATILE
AC_C_RESTRICT
+AX_CXX_GCC_ABI_DEMANGLE
+
+AC_CHECK_LIB([rt], [clock_gettime],
+ [
+ rt_lib="-lrt"
+ AC_DEFINE([HAVE_LIBRT], [ 1 ], [Have clock_gettime])
+ ],
+ [
+ AC_DEFINE([HAVE_LIBRT], [ 0 ], [Have clock_gettime])
+ ])
+
+AC_CHECK_LIB([m], [floor])
+
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"],
[