Rollup from build trunk.

[m6w6/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index fc349ae02d33c5b0d0ef20ce416fcc8dc7c31014..d2183085878513513158ef37923c59dcc803c3dd 100644 (file)
--- 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],[0.52],[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
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -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/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(HAVE_LIBGEARMAN, false)
-AC_DEFINE([HAVE_LIBGEARMAN], [0], [Enables libgearman Support])
 
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
@@ -128,7 +127,14 @@ 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([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]))
+
+AX_COMPILER_VENDOR
 AC_CXX_HEADER_STDCXX_98
+AX_TLS
 
 AC_FUNC_ALLOCA
 AC_FUNC_ERROR_AT_LINE
@@ -149,6 +155,26 @@ AC_TYPE_UINT32_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
+
+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"],
       [
@@ -183,8 +209,10 @@ SOCKET_SEND_FLAGS
 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