Comment 8 for bug 1164440

Revision history for this message
jinjianmin (jianminjin) wrote :

hi, Brian Aker

are you sure 1.0.17 could compile after merge the diff below?i have tried but with no luck.

libtest/memcached.cc: In constructor 'libtest::Memcached::Memcached(const string&, in_port_t, bool, const string&, const string&)':
libtest/memcached.cc:75:21: error: 'MEMCACHED_BINARY' was not declared in this scope
libtest/memcached.cc: In constructor 'libtest::Memcached::Memcached(const string&, in_port_t, bool)':
libtest/memcached.cc:82:21: error: 'MEMCACHED_BINARY' was not declared in this scope
libtest/memcached.cc: In member function 'const char* libtest::Memcached::executable()':
libtest/memcached.cc:134:12: error: 'MEMCACHED_BINARY' was not declared in this scope
make[1]: *** [libtest/libtest_libtest_la-memcached.lo] Error 1
make[1]: *** Waiting for unfinished jobs....

any suggestion?

=== modified file 'm4/ax_memcached.m4'
2 --- m4/ax_memcached.m4 2013-07-18 10:28:37 +0000
3 +++ m4/ax_memcached.m4 2013-10-11 11:46:36 +0000
4 @@ -44,15 +44,26 @@
5 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
6 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
7
8 -#serial 3
9 +#serial 4
10
11 AC_DEFUN([AX_PROG_MEMCACHED],
12 - [AX_WITH_PROG([MEMCACHED_BINARY],[memcached])
13 - AS_IF([test -f "$ac_cv_path_MEMCACHED_BINARY"],
14 - [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
15 - AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$ac_cv_path_MEMCACHED_BINARY",[Name of the memcached binary used in make test])
16 - 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}'`
17 - AC_MSG_RESULT([memcached version "$ax_memcached_version"])
18 - AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])
19 - ])
20 - ])
21 + [AX_WITH_PROG([MEMCACHED_BINARY],[memcached],[unknown])
22 + ax_memcached_success=
23 + AS_IF([test x"$MEMCACHED_BINARY" != xunknown],
24 + [AS_IF([test -x "$MEMCACHED_BINARY"],
25 + [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}'`
26 + AS_IF([test -n "$ax_memcached_version"],
27 + [ax_memcached_success='ok'
28 + AC_MSG_RESULT([memcached version "$ax_memcached_version"])
29 + AC_DEFINE_UNQUOTED([MEMCACHED_VERSION],"$ax_memcached_version",[Memcached binary version])])
30 + ])
31 + ])
32 +
33 + AS_IF([test -n "$ax_memcached_success"],
34 + [AC_DEFINE([HAVE_MEMCACHED_BINARY], [1], [If Memcached binary is available])
35 + AC_DEFINE_UNQUOTED([MEMCACHED_BINARY],"$MEMCACHED_BINARY",[Name of the memcached binary used in make test])
36 + ],
37 + [AC_DEFINE([HAVE_MEMCACHED_BINARY], [0], [If Memcached binary is available])
38 + MEMCACHED_BINARY=
39 + ])
40 + ])