X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=configure.ac;h=9b8a82c581c3a0241ed5b3403eb008430a198cfc;hb=9cde1fdc1bbd49775c75a83e44c942354129f1d5;hp=0db997591b1b3ce2731459b6edabb36b6f03ae46;hpb=d74eed71be1b77f3502fb8d07b1702d115a6f6c3;p=awesomized%2Flibmemcached

diff --git a/configure.ac b/configure.ac
index 0db99759..9b8a82c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
 #!/usr/bin/env bash
-# libmemcached
-# Copyright (C) 2008 Brian Aker, Monty Taylor
+# LibmemcacheD
+# Copyright (C) 2011 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_PREREQ(2.59)
-AC_INIT([libmemcached],[0.41],[http://libmemcached.org/])
-AC_CONFIG_SRCDIR([libmemcached/memcached.c])
+AC_INIT([libmemcached],[0.49],[http://libmemcached.org/])
+AC_CONFIG_SRCDIR([libmemcached/memcached.cc])
 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_LIBRARY_VERSION=5:1:1
+MEMCACHED_UTIL_LIBRARY_VERSION=2:0:0
+MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0
+MEMCACHED_LIBRARY_VERSION=7:0:0
 #                         | | |
 #                  +------+ | +---+
 #                  |        |     |
@@ -25,29 +30,91 @@ MEMCACHED_LIBRARY_VERSION=5:1:1
 #                  |        +- 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)
 
 
-HASHKIT_LIBRARY_VERSION=0:0:0
+HASHKIT_LIBRARY_VERSION=1:0:0
 AC_SUBST(HASHKIT_LIBRARY_VERSION)
 
+AH_TOP([
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#ifdef _SYS_FEATURE_TESTS_H
+#error "You should include config.h as your first include file"
+#endif
+
+#ifdef WIN32
+#define _WIN32_WINNT 0x0501
+#endif
+])
+
+AH_BOTTOM([
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
+
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+#include "poll/poll.h"
+#endif
+
+/* To hide the platform differences between MS Windows and Unix, I am
+ * going to use the Microsoft way and #define the Microsoft-specific
+ * functions to the unix way. Microsoft use a separate subsystem for sockets,
+ * but Unix normally just use a filedescriptor on the same functions. It is
+ * a lot easier to map back to the unix way with macros than going the other
+ * way without side effect ;-)
+ */
+#ifdef WIN32
+#include "win32/wrappers.h"
+#define get_socket_errno() WSAGetLastError()
+#else
+#define INVALID_SOCKET -1
+#define SOCKET_ERROR -1
+#define closesocket(a) close(a)
+#define get_socket_errno() errno
+#endif
+
+#ifndef HAVE_MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
+#ifndef HAVE_MSG_DONTWAIT
+#define MSG_DONTWAIT 0
+#endif
+
+#ifndef HAVE_MSG_MORE
+#define MSG_MORE 0
+#endif
+
+#endif
+])
+
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
 AC_CHECK_FUNCS([getline])
 
-PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_LIBEVENT
+my_saved_libs="$LIBS"
+LIBS=
 PANDORA_REQUIRE_PTHREAD
-PANDORA_CXX_DEMANGLE
+LIBS="$my_saved_libs"
 
 dnl Specialty checks
 DETECT_BYTEORDER
 ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
-REQUIRE_POD2MAN
-REQUIRE_PODCHECKER
+ENABLE_MURMUR_HASH
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
@@ -69,9 +136,19 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
 	              [1],
                       [Define to true if you want to use functions from atomic.h])])])
 
+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_CFLAGS="$AM_CFLAGS $NO_WERROR"
+       AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR"
+      ])
+DETECT_EAGAIN
+SOCKET_SEND_FLAGS
+
 AC_CONFIG_FILES([
   Makefile
-  docs/Makefile
   libhashkit/configure.h
   libmemcached/configure.h
   support/libmemcached.pc