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

diff --git a/configure.ac b/configure.ac
index d450ef1f..4beb8a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # libmemcached
-# Copyright (C) 2008 Brian Aker, Monty Taylor
+# Copyright (C) 2006-2010 Brian Aker, Monty Taylor, Trond Norbye
 # All rights reserved.
 #
 # Use and distribution licensed under the BSD license.  See
@@ -35,6 +35,54 @@ AC_SUBST(MEMCACHED_LIBRARY_VERSION)
 HASHKIT_LIBRARY_VERSION=0: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
+
+#endif
+])
+
 AC_SEARCH_LIBS(getopt_long, gnugetopt)
 AC_SEARCH_LIBS(gethostbyname, nsl)
 
@@ -42,7 +90,10 @@ AC_CHECK_FUNCS([getline])
 
 PANDORA_HAVE_LIBGTEST
 PANDORA_HAVE_LIBEVENT
+my_saved_libs="$LIBS"
+LIBS=
 PANDORA_REQUIRE_PTHREAD
+LIBS="$my_saved_libs"
 PANDORA_CXX_DEMANGLE
 
 dnl Specialty checks
@@ -50,8 +101,6 @@ DETECT_BYTEORDER
 ENABLE_UTILLIB
 SETSOCKOPT_SANITY
 ENABLE_HSIEH_HASH
-REQUIRE_POD2MAN
-REQUIRE_PODCHECKER
 PROTOCOL_BINARY_TEST
 WITH_MEMCACHED
 ENABLE_DEPRECATED
@@ -73,6 +122,26 @@ AS_IF([test "x$ac_cv_header_atomic_h" = "xyes"],[
 	              [1],
                       [Define to true if you want to use functions from atomic.h])])])
 
+AC_ARG_WITH([docs],
+  [AS_HELP_STRING([--with-docs],
+    [Generate documentation (yes|no) @<:@default=yes@:>@])],
+  [with_docs=$withval],
+  [with_docs=yes])
+
+AS_IF([test "$with_docs" = "yes"],
+  [
+    REQUIRE_POD2MAN
+    REQUIRE_PODCHECKER
+  ])
+AM_CONDITIONAL(BUILD_DOCS, test "$with_docs" = "yes")
+
+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")
+DETECT_EAGAIN
+
 AC_CONFIG_FILES([
   Makefile
   docs/Makefile
@@ -109,3 +178,13 @@ case "$host_os" in
   ;;
 esac
 
+AS_IF(test "$with_docs" = "no",
+  [
+    echo "*****"
+    echo "*"
+    echo "*  WARNING: You are not generating any documentation."
+    echo "*           Please don't ship libmemcached to an end user"
+    echo "*           without documentation..."
+    echo "*"
+    echo "*****"
+  ])