Update check for memcached version.

diff --git a/configure.ac b/configure.ac
index 8808ad266fb19cf35cd9fb02ee9f2c56d162ac43..f21171d319ce2b883e37b80384dbb04e0e6d90d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -100,9 +100,13 @@ PROTOCOL_BINARY_TEST
 ENABLE_DEPRECATED
 
 # Checks for programs.
+AC_PROG_AWK
+AC_PROG_SED
+AC_PROG_MKDIR_P
 AC_CHECK_PROGS([LEX],['flex'],[:])
 AC_CHECK_PROGS([YACC],['bison'],[:])
 AX_PROG_SPHINX_BUILD
+AX_PROG_MEMCACHED
 
 # Checks for libraries.
 AC_SEARCH_LIBS([getopt_long],[gnugetopt])

diff --git a/libtest/m4/memcached.m4 b/libtest/m4/memcached.m4
deleted file mode 100644 (file)
index 0fece50..0000000
--- a/libtest/m4/memcached.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-#serial 2
-
-AC_DEFUN([YATL_MEMCACHED],
-         [AX_WITH_PROG(MEMCACHED_BINARY, [memcached])
-         AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
-               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
-               AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$ac_cv_path_MEMCACHED_BINARY", [Name of the memcached binary used in make test])],
-               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
-               AC_DEFINE([MEMCACHED_BINARY], ["memcached/memcached"], [Name of the memcached binary used in make test])
-               ])
-         ])

diff --git a/libtest/yatl.m4 b/libtest/yatl.m4
index 4415863f63ab7954e501d1466c3e3081ec3dd7c2..61d1a2f0f4ecbbf3c0619a39025ac36b62d9ffe6 100644 (file)
--- a/libtest/yatl.m4
+++ b/libtest/yatl.m4
@@ -7,10 +7,8 @@ AC_SUBST([LIBTEST_VERSION],[1.0])
 AC_CONFIG_FILES([libtest/version.h])
 
 m4_include([libtest/m4/mysql.m4])
-m4_include([libtest/m4/memcached.m4])
 AC_DEFINE([HAVE_MEMCACHED_SASL_BINARY],[0],[If Memcached binary with sasl support is available])
 
 YATL_MYSQL
-YATL_MEMCACHED
 
 AC_CONFIG_FILES([libtest/yatlcon.h])

diff --git a/m4/ax_memcached.m4 b/m4/ax_memcached.m4
new file mode 100644 (file)
index 0000000..21067c6
--- /dev/null
+++ b/m4/ax_memcached.m4
@@ -0,0 +1,58 @@
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+# ===========================================================================
+#      https://github.com/BrianAker/ddm4/
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_MEMCACHED
+#
+# DESCRIPTION
+#
+#   Check for memcached and list version
+#
+# LICENSE
+#
+#  Copyright (C) 2013 Brian Aker
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are
+#  met:
+#
+#      * Redistributions of source code must retain the above copyright
+#  notice, this list of conditions and the following disclaimer.
+#
+#      * Redistributions in binary form must reproduce the above
+#  copyright notice, this list of conditions and the following disclaimer
+#  in the documentation and/or other materials provided with the
+#  distribution.
+#
+#      * The names of its contributors may not be used to endorse or
+#  promote products derived from this software without specific prior
+#  written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#serial 3
+
+AC_DEFUN([AX_PROG_MEMCACHED],
+    [AX_WITH_PROG([MEMCACHED_BINARY],[memcached])
+    AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
+      [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
+      AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test])
+      ax_memcached_version=`$MEMCACHED_BINARY -h | sed 1q | awk '{print \$ 2 }' | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "%d.%d.%d", $[]1, $[]2, $[]3}'`
+      AC_MSG_RESULT([memcached version "$ax_memcached_version"])
+      AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])
+      ])
+    ])