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

[m6w6/libmemcached] / libmemcachedinternal / include.am

diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am
index a6153cd546e3f496fefb638e9c69c7adff97bd59..75e58d637b9a19f90048ea24d8c13ea881eebd54 100644 (file)
--- 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} \
@@ -20,6 +22,8 @@ libmemcachedinternal_libmemcachedinternal_la_CXXFLAGS= \
                                                       ${AM_CXXFLAGS} \
                                                       ${NO_CONVERSION} \
                                                       -DBUILDING_LIBMEMCACHEDINTERNAL
-libmemcachedinternal_libmemcachedinternal_la_LDFLAGS= ${AM_LDFLAGS}
+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