-dnl ---------------------------------------------------------------------------
-dnl Macro: MEMCACHED_TEST
-dnl ---------------------------------------------------------------------------
-saved_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=""
AC_ARG_WITH(memcached,
- [ --with-memcached=PATH Specify path to memcached installation ],
- [
- if test "x$withval" != "xno" ; then
- CPPFLAGS="-I${withval}/include"
- fi
- ]
-)
+[[ --with-memcached[=memcached binary]
+ Memcached binary to use for make test]],
+[
+ if test -n "$withval"
+ then
+ MEMC_BINARY="$withval"
+ fi
-AC_CHECK_HEADER(memcached/protocol_binary.h, [
- AC_RUN_IFELSE([
- AC_LANG_PROGRAM([
- #include "memcached/protocol_binary.h"
- ], [
- protocol_binary_request_set request;
- if (sizeof(request) != sizeof(request.bytes)) {
- return 1;
- }
- ])
- ],[
- if test "x$CPPFLAGS" != "x" ; then
- CPPFLAGS="$saved_CPPFLAGS $CPPFLAGS"
- else
- CPPFLAGS="$saved_CPPFLAGS"
- fi
- ], AC_MSG_ERROR([Unsupported struct padding done by compiler.]))
- ], [
- AC_MSG_ERROR([Cannot locate memcached/protocol_binary.])
- ])
+ if test x$withval == xyes
+ then
+ MEMC_BINARY=memcached
+ fi
-dnl ---------------------------------------------------------------------------
-dnl End Macro: MEMCACHED_TEST
-dnl ---------------------------------------------------------------------------
+ # just ignore the user if --without-memcached is passed.. it is
+ # only used by make test
+ if test x$withval == xno
+ then
+ MEMC_BINARY=memcached
+ fi
+],
+[
+ AC_PATH_PROG([MEMC_BINARY], [memcached], "no", [$PATH])
+])
+
+if test x$MEMC_BINARY == "xno"
+then
+ AC_MSG_ERROR(["could not find memcached binary"])
+fi
+
+AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMC_BINARY",
+ [Name of the memcached binary used in make test])