Merge in Ubuntu fixes.

diff --git a/libtest/include.am b/libtest/include.am
index ebc9adf75496c5db07412657a72b7a93d072e71d..be4f73ae49a4615eeda2f589b52462b458645b79 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -61,7 +61,12 @@ libtest_libtest_la_LIBADD=
 LIBTEST_LDADD= libtest/libtest.la
 
 if HAVE_LIBMEMCACHED
-LIBTEST_LDADD+= $(libmemcached_LIBS) -lmemcachedutil
+if BUILD_LIBMEMCACHEDUTIL
+LIBTEST_LDADD+= libmemcached/libmemcached.la
+LIBTEST_LDADD+= libmemcached/libmemcachedutil.la
+else
+LIBTEST_LDADD+= $(libmemcached_LIBS)
+endif
 libtest_libtest_la_SOURCES+= libtest/memcached.cc
 endif
 
@@ -91,9 +96,8 @@ tests/var/run:
 
 
 libtest_unittest_CFLAGS=
-libtest_unittest_LDADD= \
-                       ${LIBTEST_LDADD} \
-                       libtest/libtest.la
+libtest_unittest_LDADD= ${LIBTEST_LDADD}
+libtest_unittest_DEPENDENCIES= ${LIBTEST_LDADD}
 libtest_unittest_SOURCES= libtest/unittest.cc
 check_PROGRAMS+= libtest/unittest
 noinst_PROGRAMS+= libtest/unittest

diff --git a/support/libmemcached.pc.in b/support/libmemcached.pc.in
index 09741f485dc56e52e5fd481878c1fa4e9ce3310a..03031f92bb8ea36a94e7537f59cde3b768db4b16 100644 (file)
--- a/support/libmemcached.pc.in
+++ b/support/libmemcached.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: libmemcached
 Description: libmemcached C library.
 Version: @VERSION@
-Libs: @LTLIBSASL@ @LTLIBSASL2@ -L${libdir} -lmemcached
+Libs: @LTLIBSASL@ @LTLIBSASL2@ -L${libdir} -lmemcached -lmemcachedutil -pthread
 Cflags: -I${includedir}