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

[awesomized/libmemcached] / configure.ac

diff --git a/configure.ac b/configure.ac
index cb91cb13ae789fd245a56b9fcbfefd78bc56853c..3827735a4e752892a235ba722422792133a72c33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,9 +7,9 @@
 # Use and distribution licensed under the BSD license.  See
 # the COPYING file in this directory for full text.
 
-AC_INIT([libmemcached],[1.0.11],[http://libmemcached.org/])
+AC_INIT([libmemcached],[1.0.12],[http://libmemcached.org/])
 
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AC_CANONICAL_TARGET
 
@@ -255,9 +255,6 @@ AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event],
                  [AC_MSG_WARN([Unable to find libevent])])
 AM_CONDITIONAL(HAVE_LIBEVENT, test "x${ax_cv_have_LIBEVENT}" = "xyes")
 
-AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEXEC.])],
-                       [AC_DEFINE([HAVE_SOCK_CLOEXEC], [0], [Check for SOCK_CLOEXEC.])])
-
 AX_UUID_GENERATE_TIME_SAFE