X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Finclude.am;h=a9077c81818249eb53c3cb223e6b9d417e36ce89;hb=5c9c359b73396ad0b2ba903b6bbbff21d045c345;hp=8d6a041702b027e15fdbd3a13b73246ed5d5f2d5;hpb=96d1620a781bc2200f6e24c5cdb77758992f8bdf;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 8d6a0417..a9077c81 100644
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -38,6 +38,8 @@ noinst_HEADERS+= tests/string.h
 noinst_HEADERS+= tests/touch.h
 noinst_HEADERS+= tests/virtual_buckets.h
 
+if HAVE_DTRACE
+else
 # Test internals
 tests_libmemcached_1_0_internals_CXXFLAGS=
 tests_libmemcached_1_0_internals_DEPENDENCIES=
@@ -61,6 +63,8 @@ noinst_PROGRAMS+= tests/libmemcached-1.0/internals
 test-internal: tests/libmemcached-1.0/internals
 	@tests/testplus
 
+endif
+
 tests_libmemcached_1_0_testapp_CXXFLAGS=
 tests_libmemcached_1_0_testapp_CFLAGS=
 tests_libmemcached_1_0_testapp_SOURCES=
@@ -104,7 +108,7 @@ tests_libmemcached_1_0_testapp_DEPENDENCIES+= libtest/libtest.la
 tests_libmemcached_1_0_testapp_DEPENDENCIES+= libhashkit/libhashkit.la
 tests_libmemcached_1_0_testapp_DEPENDENCIES+= libmemcached/libmemcachedutil.la
 
-tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testapp_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testapp_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
@@ -160,7 +164,7 @@ tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libtest/libtest.la
 tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libhashkit/libhashkit.la
 tests_libmemcached_1_0_testsocket_DEPENDENCIES+= libmemcached/libmemcachedutil.la
 
-tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LDFLAGS@
+tests_libmemcached_1_0_testsocket_LDADD+= @LIBUUID_LIB@
 tests_libmemcached_1_0_testsocket_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
@@ -174,10 +178,9 @@ test-socket: tests/libmemcached-1.0/testsocket
 	@tests/libmemcached-1.0/testsocket
 
 gdb-socket: tests/libmemcached-1.0/testsocket
-	@$(DEBUG_COMMAND) tests/libmemcached-1.0/testsocket
+	@$(GDB_COMMAND) tests/libmemcached-1.0/testsocket
 
 tests_libmemcached_1_0_sasl_SOURCES=
-tests_libmemcached_1_0_sasl_DEPENDENCIES=
 tests_libmemcached_1_0_sasl_LDADD=
 tests_libmemcached_1_0_sasl_CXXFLAGS=
 tests_libmemcached_1_0_sasl_CFLAGS=
@@ -205,9 +208,6 @@ tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
 tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
 tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
 
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libmemcached/libmemcached.la
-tests_libmemcached_1_0_sasl_DEPENDENCIES+= libtest/libtest.la
-
 tests_libmemcached_1_0_sasl_LDADD+= @PTHREAD_LIBS@
 tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
 tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
@@ -221,7 +221,7 @@ test-sasl: tests/libmemcached-1.0/sasl
 	@tests/libmemcached-1.0/sasl
 
 gdb-sasl: tests/libmemcached-1.0/sasl
-	@$(DEBUG_COMMAND)  tests/libmemcached-1.0/sasl
+	@$(GDB_COMMAND)  tests/libmemcached-1.0/sasl
 
 tests_atomsmasher_SOURCES=
 tests_atomsmasher_DEPENDENCIES=
@@ -283,7 +283,7 @@ test-plus: tests/testplus
 	@tests/testplus
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND) tests/testplus
+	$(GDB_COMMAND) tests/testplus
 
 valgrind-plus: tests/testplus
 	@$(VALGRIND_COMMAND) tests/testplus