From 0cfc5fe2a092a33fc8a608da4256f5ba51f7b41e Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sun, 18 Nov 2012 23:24:48 -0500 Subject: [PATCH] Fix symbol issue when compiling internal tests. --- libmemcachedinternal/include.am | 3 +++ tests/libmemcached-1.0/include.am | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am index 678eb1c8..75e58d63 100644 --- a/libmemcachedinternal/include.am +++ b/libmemcachedinternal/include.am @@ -7,6 +7,8 @@ # will not be exposed in the shipped .so noinst_LTLIBRARIES+= libmemcachedinternal/libmemcachedinternal.la +if HAVE_DTRACE +else libmemcachedinternal_libmemcachedinternal_la_SOURCES= $(libmemcached_libmemcached_la_SOURCES) libmemcachedinternal_libmemcachedinternal_la_CFLAGS= \ ${AM_CFLAGS} \ @@ -24,3 +26,4 @@ libmemcachedinternal_libmemcachedinternal_la_LDFLAGS= libmemcachedinternal_libmemcachedinternal_la_LDFLAGS+= @DL_LIB@ libmemcachedinternal_libmemcachedinternal_la_LIBADD= $(libmemcached_libmemcached_la_LIBADD) libmemcachedinternal_libmemcachedinternal_la_DEPENDENCIES= $(libmemcached_libmemcached_la_DEPENDENCIES) +endif diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am index 8d6a0417..1add550f 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= -- 2.30.2