projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Make version handle messages by priority.
[awesomized/libmemcached]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 602b4520bec8dc6bd55d44ea5f89808b9eb128ee..c13d23cba9ac77b25a2beb6a834fce3b8e62e476 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.
4
],[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
# | | |
# +------+ | +---+
# | | |
# | | |
# +------+ | +---+
# | | |
@@
-58,6
+58,11
@@
LT_LANG([C++])
LT_LANG([C])
gl_VISIBILITY
LT_LANG([C])
gl_VISIBILITY
+AX_CXX_HEADER_STDCXX_98
+ if test "$ax_cv_cxx_stdcxx_98" = no; then
+ AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
+ fi
+
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])
@@
-72,8
+77,6
@@
AM_CONDITIONAL(BUILDING_GEARMAN, false)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
AC_SEARCH_LIBS(getopt_long, gnugetopt)
AC_SEARCH_LIBS(gethostbyname, nsl)
-PANDORA_HAVE_LIBEVENT
-
case "$target_os" in
*linux*)
AS_IF([test "x$GCC" = "xyes"],
case "$target_os" in
*linux*)
AS_IF([test "x$GCC" = "xyes"],
@@
-85,6
+88,7
@@
case "$target_os" in
dnl Specialty checks
AX_PTHREAD
dnl Specialty checks
AX_PTHREAD
+AX_CXX_CINTTYPES
CONFIG_EXTRA
DETECT_BYTEORDER
ENABLE_UTILLIB
CONFIG_EXTRA
DETECT_BYTEORDER
ENABLE_UTILLIB
@@
-129,8
+133,10
@@
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([sasl/sasl.h])
AC_CHECK_HEADERS([execinfo.h])
AC_CHECK_HEADERS([cxxabi.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_DEFINE([HAVE_CXXABI_H], [1], [Have cxxabi.h]),
+ AC_DEFINE([HAVE_CXXABI_H], [0], [Have cxxabi.h]))
+
+AX_COMPILER_VENDOR
AC_CXX_HEADER_STDCXX_98
AC_FUNC_ALLOCA
AC_CXX_HEADER_STDCXX_98
AC_FUNC_ALLOCA
@@
-160,6
+166,18
@@
AC_C_RESTRICT
AX_CXX_GCC_ABI_DEMANGLE
AX_CXX_GCC_ABI_DEMANGLE
+AC_CHECK_LIB([rt], [clock_gettime],
+ [
+ RT_LIB="-lrt"
+ AC_SUBST(RT_LIB)
+ 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"],
[
@@
-188,9
+206,17
@@
AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
])
AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
])
-DETECT_EAGAIN
SOCKET_SEND_FLAGS
SOCKET_SEND_FLAGS
+AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event],
+ [
+ LIBEVENT_LDFLAGS="-levent"
+ ],
+ [
+ AC_MSG_WARN([Unable to find libevent])
+ ])
+AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes")
+
AC_CONFIG_FILES([
Makefile
docs/conf.py
AC_CONFIG_FILES([
Makefile
docs/conf.py