Merge in build trunk

[m6w6/libmemcached] / libtest / include.am

diff --git a/libtest/include.am b/libtest/include.am
index a91cc2ac028c069009ae4c346f83fa59ae7dd0da..a668d69034104ff495efd2243f20df511b88d0d4 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -35,6 +35,9 @@ export GDB_COMMAND
 valgrind:
        @echo make check TESTS_ENVIRONMENT="\"$(VALGRIND_COMMAND)\""
 
+gdb:
+       @echo make check TESTS_ENVIRONMENT="\"$(GDB_COMMAND)\""
+
 helgrind:
        @echo make check TESTS_ENVIRONMENT="\"$(HELGRIND_COMMAND)\""
 
@@ -149,11 +152,8 @@ libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc
 libtest_libtest_la_SOURCES+= util/operation.cc
-libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBGEARMAN
-libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY="\"${abs_top_builddir}/gearmand/gearmand\""
 libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER="\"${abs_top_builddir}/benchmark/blobslap_worker\""
 
-libtest_unittest_CXXFLAGS+= -DHAVE_LIBGEARMAN
 libtest_unittest_LDADD+= libgearman/libgearman.la
 libtest_unittest_DEPENDENCIES+= libgearman/libgearman.la
 else
@@ -164,12 +164,9 @@ libtest_libtest_la_SOURCES+= libtest/blobslap_worker.cc
 libtest_libtest_la_SOURCES+= libtest/gearmand.cc
 libtest_libtest_la_SOURCES+= util/instance.cc
 libtest_libtest_la_SOURCES+= util/operation.cc
+libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER=0
 else
-libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BINARY=0
 libtest_libtest_la_CXXFLAGS+= -DGEARMAND_BLOBSLAP_WORKER=0
-libtest_libtest_la_CXXFLAGS+= -DHAVE_LIBGEARMAN=0
-libtest_unittest_CXXFLAGS+= -DGEARMAND_BINARY=0
-libtest_unittest_CXXFLAGS+= -DHAVE_LIBGEARMAN=0
 endif
 endif