Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-230

[awesomized/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index 14a9547261bb906b882a35f86930af720c2daad5..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
@@ -153,8 +157,8 @@ libtest_libtest_la_LIBADD+= $(CURL_LIBS)
 libtest_libtest_la_LIBADD+= @RT_LIB@
 
 EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
-EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/abort
-EXTRA_libtest_libtest_la_DEPENDENCIES+=libtest/wait
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
+EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/wait
 
 # Declare unittest so that we can append to it
 libtest_unittest_CXXFLAGS=