Patches from Piotr Sikora < piotr.sikora@frickle.com > for OpenBSD.

[m6w6/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5cc32bd740e5f6f1c3bf788b517ba6d66cd2aaa6..dc560daf1a15a79bc66e17ef9051822c1c6e11a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 # libmemcached
 # Copyright (C) 2008 Brian Aker, Monty Taylor
 # All rights reserved.
@@ -15,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=3:0:0
+MEMCACHED_LIBRARY_VERSION=4:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -35,7 +36,7 @@ AC_SUBST(HASHKIT_LIBRARY_VERSION)
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
-AC_CHECK_FUNCS_ONCE([getline])
+AC_CHECK_FUNCS([getline])
 
 PANDORA_HAVE_LIBEVENT
 PANDORA_REQUIRE_PTHREAD
@@ -53,19 +54,21 @@ WITH_MEMCACHED
 ENABLE_DEPRECATED
 PANDORA_HAVE_LIBINNODB
 PANDORA_PRINT_CALLSTACK
+DETECT_BITFIELD
 
 AC_CHECK_HEADERS([atomic.h])
-AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],
+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"],
+      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])))
+                      [Define to true if you want to use functions from atomic.h])])])
 
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile
+  libhashkit/configure.h
   libmemcached/configure.h
   support/libmemcached.pc
   support/libmemcached.spec