Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-90

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index 454f5c6a89337749333485ae6792e25cb36fa17b..90d5abdef426bf92f517149251aa36cb00900e3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.13],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.14],[http://libmemcached.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -59,6 +59,20 @@ AS_IF([ test "$ax_cv_cxx_stdcxx_98" = no ],[
        AC_MSG_ERROR([Your system lacks a new enough C++ compiler])
        ])
 
+AC_DEFUN([LIBMEMCACHED_PROTOCOL],
+         [AC_ARG_ENABLE([libmemcachedprotocol],
+                        [AS_HELP_STRING([--enable-libmemcachedprotocol],
+                                        [Enable libmemcachedprotocol])],
+                                        [ax_enable_libmemcachedprotocol=yes],
+                                        [ax_enable_libmemcachedprotocol=no])
+
+         AM_CONDITIONAL([BUILD_LIBMEMCACHED_PROTOCOL],[test "$ax_enable_libmemcachedprotocol" = "yes"])
+
+         AC_MSG_CHECKING([for libmemcachedprotocol])
+         AC_MSG_RESULT([$ax_enable_libmemcachedprotocol])
+         ])
+LIBMEMCACHED_PROTOCOL
+
 # Adding support for libtest
 m4_include([libtest/yatl.m4])
 
@@ -103,12 +117,12 @@ AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([inttypes.h])
 AC_CHECK_HEADERS([libintl.h])
 AC_CHECK_HEADERS([limits.h])
-AC_CHECK_HEADERS([malloc.h])
 AC_CHECK_HEADERS([math.h])
 AC_CHECK_HEADERS([netdb.h])
 AC_CHECK_HEADERS([netinet/in.h])
 AC_CHECK_HEADERS([netinet/tcp.h])
 AC_CHECK_HEADERS([pthread.h])
+AC_CHECK_HEADERS([spawn.h])
 AC_CHECK_HEADERS([stdarg.h])
 AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([stdio.h])
@@ -116,9 +130,13 @@ AC_CHECK_HEADERS([stdlib.h])
 AC_CHECK_HEADERS([sys/socket.h])
 AC_CHECK_HEADERS([sys/sysctl.h])
 AC_CHECK_HEADERS([sys/time.h])
+AC_CHECK_HEADERS([sys/un.h])
 AC_CHECK_HEADERS([time.h])
 AC_CHECK_HEADERS([unistd.h])
-AC_HEADER_TIME
+
+# Windows only
+AC_CHECK_HEADERS([winsock2.h])
+AC_CHECK_HEADERS([ws2tcpip.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 
@@ -126,6 +144,7 @@ AC_HEADER_TIME
 
 AC_CHECK_FUNCS([alarm])
 AC_CHECK_FUNCS([dup2])
+AC_CHECK_FUNCS([fcntl])
 AC_CHECK_FUNCS([getline])
 AC_CHECK_FUNCS([gettimeofday])
 AC_CHECK_FUNCS([memchr])
@@ -146,11 +165,9 @@ AC_CHECK_FUNCS([strtoull])
 AC_FUNC_ALLOCA
 AC_FUNC_ERROR_AT_LINE
 AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
 AC_FUNC_STRERROR_R
 
-AC_CHECK_HEADER(umem.h, [
+AC_CHECK_HEADER([umem.h], [
    AC_DEFINE([HAVE_UMEM_H], 1,
          [Define this if you have umem.h])
    build_cache=no
@@ -192,7 +209,7 @@ AS_IF([test "x$ac_enable_sasl" = "xyes"], [
        ],[ LIBMEMCACHED_WITH_SASL_SUPPORT="#define LIBMEMCACHED_WITH_SASL_SUPPORT 0" ])
 AC_SUBST(LIBMEMCACHED_WITH_SASL_SUPPORT)
 
-AC_CHECK_LIB([rt], [clock_gettime], [
+AC_CHECK_LIB([rt],[clock_gettime], [
               RT_LIB="-lrt"
               AC_SUBST(RT_LIB)
               AC_DEFINE([HAVE_CLOCK_GETTIME], [ 1 ], [Have clock_gettime])
@@ -201,7 +218,7 @@ AC_CHECK_LIB([rt], [clock_gettime], [
               ])
 
 # Check for the ability to call dlopen
-AC_CHECK_LIB([dl], [dlopen], [
+AC_CHECK_LIB([dl],[dlopen], [
               DL_LIB="-ldl"
               AC_SUBST([DL_LIB])
               AC_DEFINE([HAVE_LIBDL],[1],[Have dlopen])
@@ -209,7 +226,7 @@ AC_CHECK_LIB([dl], [dlopen], [
                  AC_DEFINE([HAVE_LIBDL], [0], [Have dlopen])
                  ])
 
-AC_CHECK_LIB([m], [floor])
+AC_CHECK_LIB([m],[floor])
 AC_CHECK_FUNCS([sigignore])
 
 AC_CHECK_HEADERS([atomic.h])