Merge Monty.

[m6w6/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7912531eb4f0e8d8dbb7dc4dd5dd79c6b1bdfd35..342f92de0f1839cb8c96ad6891acdf5baf4ea1f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,12 +14,14 @@ AC_CONFIG_MACRO_DIR([m4])
 
 PANDORA_CANONICAL_TARGET
 
+HASHKIT_LIBRARY_VERSION=0:0:0
+AC_SUBST(HASHKIT_LIBRARY_VERSION)
+
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
 AC_CHECK_FUNCS_ONCE([getline])
 
-
 PANDORA_HAVE_LIBEVENT
 PANDORA_REQUIRE_PTHREAD
 PANDORA_CXX_DEMANGLE
@@ -36,15 +38,20 @@ ENABLE_DEPRECATED
 PANDORA_HAVE_LIBINNODB
 PANDORA_PRINT_CALLSTACK
 
+AC_CHECK_HEADERS([atomic.h])
+AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
+      AC_CHECK_FUNCS(atomic_add_64)
+      AC_CHECK_FUNCS(atomic_add_32)
+      AS_IF([test "x$ac_cv_func_atomic_add_64" = "xyes" -a "x$ac_cv_func_atomic_add_32" = "xyes"],
+            AC_DEFINE([USE_ATOMIC_H],
+                     [1],
+                      [Define to true if you want to use functions from atomic.h])))
+
 AC_CONFIG_FILES([
   Makefile
-  clients/Makefile
-  tests/Makefile
   docs/Makefile
-  example/Makefile
-  libmemcached/Makefile
   libmemcached/memcached_configure.h
-  support/Makefile
+  libhashkit/Makefile
   support/libmemcached.pc
   support/libmemcached.spec
   support/libmemcached-fc.spec