X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_memcached.m4;h=c794b509154ae4c461661d200584e04df7e3e287;hb=411d5ae2fdcd66d8613d38c3725e4ef76f022fea;hp=21067c68d05f6bc2a8406d7d9888e28b244fe86b;hpb=eb3945ce9820053036c315bd5faae7af83977217;p=awesomized%2Flibmemcached

diff --git a/m4/ax_memcached.m4 b/m4/ax_memcached.m4
index 21067c68..c794b509 100644
--- a/m4/ax_memcached.m4
+++ b/m4/ax_memcached.m4
@@ -44,15 +44,28 @@
 #  (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
+#serial 5
 
 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])
-      ])
-    ])
+         [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_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])
+               AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test])
+               ],
+               [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])
+               MEMCACHED_BINARY=
+               ])
+         ])