Merge in fixes for OpenBSD.

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index be8e625f0884f608d02739d47f026ba96933158b..d450ef1f26529113ab44ca5e4a942170c720a816 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,16 +7,16 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.38],[http://tangent.org/552/libmemcached.html])
+AC_INIT([libmemcached],[0.42],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
-AM_CONFIG_HEADER([config.h])
-AC_CONFIG_MACRO_DIR([m4])
 
 PANDORA_CANONICAL_TARGET
 
 #shared library versioning
-MEMCACHED_LIBRARY_VERSION=4:0:0
+MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
+MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
+MEMCACHED_LIBRARY_VERSION=5:1:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -27,6 +27,8 @@ MEMCACHED_LIBRARY_VERSION=4:0:0
 #                  |        +- increment if source code has changed
 #                  |           set to zero if current is incremented
 #                  +- increment if interfaces have been added, removed or changed
+AC_SUBST(MEMCACHED_UTIL_LIBRARY_VERSION)
+AC_SUBST(MEMCACHED_PROTOCAL_LIBRARY_VERSION)
 AC_SUBST(MEMCACHED_LIBRARY_VERSION)
 
 
@@ -38,6 +40,7 @@ AC_SEARCH_LIBS(gethostbyname, nsl)
 
 AC_CHECK_FUNCS([getline])
 
+PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_LIBEVENT
 PANDORA_REQUIRE_PTHREAD
 PANDORA_CXX_DEMANGLE
@@ -54,7 +57,6 @@ WITH_MEMCACHED
 ENABLE_DEPRECATED
 PANDORA_HAVE_LIBINNODB
 PANDORA_PRINT_CALLSTACK
-DETECT_BITFIELD
 PANDORA_HAVE_SASL
 
 dnl The sasl functions should only be visible if we build with sasl support
@@ -95,3 +97,15 @@ echo "   * Warnings as failure:       $ac_cv_warnings_as_errors"
 echo ""
 echo "---"
 
+case "$host_os" in
+  *freebsd*)
+    echo "*****"
+    echo "*"
+    echo "*  NOTE: You are on FreeBSD. BSD make will not work."
+    echo "*"
+    echo "*   use 'gmake' To build libmemcached"
+    echo "*"
+    echo "*****"
+  ;;
+esac
+