From 38d8a23b191882419106665e8988f8f5b5532fe2 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Sun, 18 Nov 2012 21:15:35 -0500 Subject: [PATCH] Fix linking issue in test case. --- libmemcached/include.am | 2 +- libmemcachedinternal/include.am | 3 ++- tests/libmemcached-1.0/include.am | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) 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= -- 2.30.2