Fix dependency on build libtest with memcached support.

diff --git a/configure.ac b/configure.ac
index 68c9fa10fe2def02d0e7e739afea3872e0b2b7c9..2435c69e79ca17768bf6af405ec52cd4d6aaa50b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,8 +84,6 @@ AM_CONDITIONAL([BUILDING_LIBMEMCACHED],[true])
 AM_CONDITIONAL([HAVE_LIBMEMCACHED],[false])
 AM_CONDITIONAL([HAVE_LIBDRIZZLE],[false])
 AC_DEFINE([HAVE_LIBMEMCACHED],[1],[Enables libmemcached Support])
-AC_SUBST([LIBMEMCACHED_CFLAGS])
-AC_SUBST([LIBMEMCACHED_LIB],[libmemcached/libmemcached.la])
 
 AM_CONDITIONAL([BUILDING_GEARMAN],[false])
 

diff --git a/libtest/include.am b/libtest/include.am
index 090e9fb1a4b164ada80882318f8f6017ddb9bf3e..d1ede13b2a1bb4278c9a1cd0280b7158f8057c15 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -108,8 +108,12 @@ libtest_libtest_la_CXXFLAGS=
 EXTRA_libtest_libtest_la_DEPENDENCIES=
 libtest_libtest_la_LIBADD=
 libtest_libtest_la_SOURCES=
+if BUILDING_LIBMEMCACHED
+libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la
+else
 libtest_libtest_la_CXXFLAGS+= @LIBMEMCACHED_CFLAGS@
 libtest_libtest_la_LIBADD+= @LIBMEMCACHED_LIB@
+endif
 
 libtest_libtest_la_SOURCES+= libtest/alarm.cc
 libtest_libtest_la_SOURCES+= libtest/binaries.cc