X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=379466df3de0495dcbc6aa0c18acc2526afd9160;hb=671ca37a89bd48331316cb98c3f54ce1bca7ef88;hp=0a2df059dc1e93bea10eb6c73e671c9353d061b4;hpb=2d434185acac985bc6025adcda8401da7da498b5;p=awesomized%2Flibmemcached diff --git a/configure.ac b/configure.ac index 0a2df059..379466df 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # the COPYING file in this directory for full text. AC_PREREQ(2.59) -AC_INIT([libmemcached],[0.43],[http://libmemcached.org/]) +AC_INIT([libmemcached],[0.44],[http://libmemcached.org/]) AC_CONFIG_SRCDIR([libmemcached/memcached.c]) AC_CONFIG_AUX_DIR(config) @@ -16,7 +16,7 @@ PANDORA_CANONICAL_TARGET #shared library versioning MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0 MEMCACHED_PROTOCAL_LIBRARY_VERSION=0:0:0 -MEMCACHED_LIBRARY_VERSION=5:2:0 +MEMCACHED_LIBRARY_VERSION=6:0:0 # | | | # +------+ | +---+ # | | | @@ -139,26 +139,11 @@ 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") - -# -# Some platforms define EWOULDBLOCK == EAGAIN, causing our switch for error -# codes to be illegal (POSIX.1-2001 allows both return codes from recv, so -# we need to test both if they differ...) -# -AC_MSG_CHECKING([if EWOULDBLOCK == EAGAIN]) -AC_RUN_IFELSE( - [AC_LANG_PROGRAM([ -#include - ], [dnl - return EAGAIN == EWOULDBLOCK ? 0 : 1; - ]) - ],[ - AC_MSG_RESULT([yes]) - ], [ - AC_MSG_RESULT([no]) - AC_DEFINE([USE_EAGAIN], [1], [Define to true if you need to test for eagain]) - ]) + [AM_LDFLAGS="$AM_LDFLAGS -lws2_32" + AM_CFLAGS="$AM_CFLAGS $NO_WERROR" + AM_CXXFLAGS="$AM_CXXFLAGS $NO_WERROR" + ]) +DETECT_EAGAIN AC_CONFIG_FILES([ Makefile