From: Brian Aker <brian@tangent.org>
Date: Mon, 19 Nov 2012 02:15:35 +0000 (-0500)
Subject: Fix linking issue in test case.
X-Git-Tag: 1.0.15~20^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=38d8a23b191882419106665e8988f8f5b5532fe2;p=m6w6%2Flibmemcached

Fix linking issue in test case.
---

diff --git a/libmemcached/include.am b/libmemcached/include.am
index 20be40f9..e230267e 100644
--- 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 a6153cd5..678eb1c8 100644
--- 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 9b023a5a..8d6a0417 100644
--- 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=