projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Partial encapsulation of memcached_st->hosts
[m6w6/libmemcached]
/
m4
/
pandora_with_memcached.m4
diff --git
a/m4/pandora_with_memcached.m4
b/m4/pandora_with_memcached.m4
index 8797393b258519eb736f901e49951554848b7fa7..81fc5955dcc82998bdc5d520420c07a25a6f7e48 100644
(file)
--- a/
m4/pandora_with_memcached.m4
+++ b/
m4/pandora_with_memcached.m4
@@
-3,7
+3,7
@@
dnl This file is free software; Sun Microsystems
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-AC_DEFUN([
PANDORA_WIT
H_MEMCACHED],[
+AC_DEFUN([
_PANDORA_SEARC
H_MEMCACHED],[
AC_ARG_WITH([memcached],
[AS_HELP_STRING([--with-memcached],
AC_ARG_WITH([memcached],
[AS_HELP_STRING([--with-memcached],
@@
-13,21
+13,29
@@
AC_DEFUN([PANDORA_WITH_MEMCACHED],[
# just ignore the user if --without-memcached is passed.. it is
# only used by make test
# just ignore the user if --without-memcached is passed.. it is
# only used by make test
- AS_IF([test "x$
withval
" = "xno"],[
+ AS_IF([test "x$
ac_cv_with_memcached
" = "xno"],[
ac_cv_with_memcached=memcached
MEMCACHED_BINARY=memcached
],[
ac_cv_with_memcached=memcached
MEMCACHED_BINARY=memcached
],[
- AS_IF([test -f "$withval"],[
- ac_cv_with_memcached=$withval
- MEMCACHED_BINARY=$withval
+ AS_IF([test -f "$ac_cv_with_memcached"],[
+ MEMCACHED_BINARY=$ac_cv_with_memcached
],[
AC_PATH_PROG([MEMCACHED_BINARY], [$ac_cv_with_memcached], "no")
],[
AC_PATH_PROG([MEMCACHED_BINARY], [$ac_cv_with_memcached], "no")
- AS_IF([test "x$MEMCACHED_BINARY" = "xno"],[
- AC_MSG_ERROR(["could not find memcached binary"])
- ])
])
])
AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMCACHED_BINARY",
[Name of the memcached binary used in make test])
])
])
AC_DEFINE_UNQUOTED([MEMCACHED_BINARY], "$MEMCACHED_BINARY",
[Name of the memcached binary used in make test])
+ AM_CONDITIONAL([HAVE_MEMCACHED],[test "x$MEMCACHED_BINARY" != "xno"])
+])
+AC_DEFUN([PANDORA_HAVE_MEMCACHED],[
+ AC_REQUIRE([_PANDORA_SEARCH_MEMCACHED])
])
])
+
+AC_DEFUN([PANDORA_REQUIRE_MEMCACHED],[
+ AC_REQUIRE([PANDORA_HAVE_MEMCACHED])
+ AS_IF([test "x$MEMCACHED_BINARY" = "xno"],[
+ AC_MSG_ERROR(["could not find memcached binary"])
+ ])
+])
+