X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=2af6cae1032aaeb296f0355119b63c8ebccb6723;hb=b95041363ea69ccfb9eacb6bba1852814c32b4ee;hp=4beb8a0ac65436dcd53783860225265ac51f7281;hpb=3aba02a06e7adfd7dfd0621ac55da31331d75b77;p=m6w6%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 4beb8a0a..2af6cae1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-# libmemcached
+# LibmemcacheD
+# Copyright (C) 2011 Data Differential, http://datadifferential.com/
 # Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
 # All rights reserved.
 #
@@ -7,16 +8,18 @@
 # the COPYING file in this directory for full text.
 
 AC_PREREQ(2.59)
-AC_INIT([libmemcached],[0.42],[http://libmemcached.org/])
+AC_INIT([libmemcached],[0.48],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
-PANDORA_CANONICAL_TARGET
+PANDORA_CANONICAL_TARGET(no-vc-changelog)
+AC_CHECK_PROGS([YACC], ['bison'], [:])
+AC_CHECK_PROGS([LEX], ['flex'], [:])
 
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0
 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
-MEMCACHED_LIBRARY_VERSION=5:1:0
+MEMCACHED_LIBRARY_VERSION=6:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -80,6 +83,14 @@ AH_BOTTOM([
 #define get_socket_errno() errno
 #endif
 
+#ifndef HAVE_MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef HAVE_MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
 #endif
 ])
 
@@ -101,6 +112,7 @@ DETECT_BYTEORDER
 ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
+ENABLE_MURMUR_HASH
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
@@ -139,8 +151,12 @@ AC_CHECK_HEADERS_ONCE(winsock2.h poll.h sys/wait.h fnmatch.h)
 AM_CONDITIONAL(BUILD_POLL, test "x$ac_cv_header_poll_h" = "xno")
 AM_CONDITIONAL(BUILD_WIN32_WRAPPERS, test "x$ac_cv_header_winsock2_h" = "xyes")
 AS_IF(test "x$ac_cv_header_winsock2_h" = "xyes",
-      AM_LDFLAGS="$AM_LDFLAGS -lws2_32")
+      [AM_LDFLAGS="$AM_LDFLAGS -lws2_32"
+       AM_CFLAGS="$AM_CFLAGS $NO_WERROR"
+       AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
+      ])
 DETECT_EAGAIN
+SOCKET_SEND_FLAGS
 
 AC_CONFIG_FILES([
   Makefile