X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=d2183085878513513158ef37923c59dcc803c3dd;hb=77eab04d2140f8e2bd904f7ac4a59b4eef54244f;hp=602b4520bec8dc6bd55d44ea5f89808b9eb128ee;hpb=920b0f21e75bb5b145a7de7383f5ae8c4a2c358a;p=m6w6%2Flibmemcached diff --git a/configure.ac b/configure.ac index 602b4520..d2183085 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ #!/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. -AC_INIT([libmemcached],[1.0.2],[http://libmemcached.org/]) +AC_INIT([libmemcached],[1.0.3],[http://libmemcached.org/]) 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 -MEMCACHED_LIBRARY_VERSION=8:0:0 +MEMCACHED_LIBRARY_VERSION=9:0:0 # | | | # +------+ | +---+ # | | | @@ -129,9 +129,12 @@ 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_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 +AX_TLS AC_FUNC_ALLOCA AC_FUNC_ERROR_AT_LINE @@ -160,6 +163,18 @@ AC_C_RESTRICT 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"], [