diff options
| author | Brian Aker <brian@tangent.org> | 2013-04-29 11:24:05 -0400 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2013-04-29 11:24:05 -0400 |
| commit | 7b3833138cda25e0de1ac93cfbaae09a5529b01f (patch) | |
| tree | 0186748162ecea25e10af829428624954f00bf02 /m4/ax_memcached.m4 | |
| parent | 87ae8c09e17201215808df298a32c6f18311c7ea (diff) | |
| download | libmemcached-7b3833138cda25e0de1ac93cfbaae09a5529b01f.tar.gz | |
Merge work in current build tree.
Diffstat (limited to 'm4/ax_memcached.m4')
| -rw-r--r-- | m4/ax_memcached.m4 | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/m4/ax_memcached.m4 b/m4/ax_memcached.m4 index 21067c68..160cfe32 100644 --- a/m4/ax_memcached.m4 +++ b/m4/ax_memcached.m4 @@ -44,15 +44,26 @@ # (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 4 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= + 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])]) + ]) + ]) + + 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= + ]) + ]) |