m4: merge TangentOrg/ddm4

[awesomized/libmemcached] / m4 / ax_memcached.m4

diff --git a/m4/ax_memcached.m4 b/m4/ax_memcached.m4
index 160cfe32399e5eaa7f17f535b66faf8391cddba4..c794b509154ae4c461661d200584e04df7e3e287 100644 (file)
--- a/m4/ax_memcached.m4
+++ b/m4/ax_memcached.m4
@@ -44,20 +44,22 @@
 #  (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 4
+#serial 5
 
 AC_DEFUN([AX_PROG_MEMCACHED],
          [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown])
          ax_memcached_success=
+         ax_memcached_version=
+         AC_MSG_CHECKING([for memcached version])
          AS_IF([test x"$MEMCACHED_BINARY" != xunknown],
                [AS_IF([test -x "$MEMCACHED_BINARY"],
                       [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}'`
                       AS_IF([test -n "$ax_memcached_version"],
                             [ax_memcached_success='ok'
-                            AC_MSG_RESULT([memcached version "$ax_memcached_version"])
                             AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])])
                       ])
                ])
+         AC_MSG_RESULT(["$ax_memcached_version"])
 
          AS_IF([test -n "$ax_memcached_success"], 
                [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])