Fix linking issue in test case.

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 20be40f9e04893947450f70b977417d45def8da4..e230267ef49091bff28fa7ffbf22bce09338db28 100644 (file)
--- a/libmemcached/include.am
+++ b/libmemcached/include.am
@@ -115,7 +115,7 @@ libmemcached_libmemcached_la_DEPENDENCIES=
 libmemcached_libmemcached_la_LIBADD=
 libmemcached_libmemcached_la_LDFLAGS=
 libmemcached_libmemcached_la_LDFLAGS+= -version-info ${MEMCACHED_LIBRARY_VERSION}
-libmemcached_libmemcached_la_LDFLAGS+= $(DL_LIB)
+libmemcached_libmemcached_la_LDFLAGS+= @DL_LIB@
 
 if HAVE_SASL
 libmemcached_libmemcached_la_CXXFLAGS+= @PTHREAD_CFLAGS@

diff --git a/libmemcachedinternal/include.am b/libmemcachedinternal/include.am
index a6153cd546e3f496fefb638e9c69c7adff97bd59..678eb1c85c0e861302159a3aadde61f22f9d3119 100644 (file)
--- a/libmemcachedinternal/include.am
+++ b/libmemcachedinternal/include.am
@@ -20,6 +20,7 @@ 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)

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 9b023a5ad2bc074ef49aace00ee03c21153b415e..8d6a041702b027e15fdbd3a13b73246ed5d5f2d5 100644 (file)
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -58,6 +58,8 @@ tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
 check_PROGRAMS+= tests/libmemcached-1.0/internals
 noinst_PROGRAMS+= tests/libmemcached-1.0/internals
 
+test-internal: tests/libmemcached-1.0/internals
+       @tests/testplus
 
 tests_libmemcached_1_0_testapp_CXXFLAGS=
 tests_libmemcached_1_0_testapp_CFLAGS=