From: Brian Aker Date: Mon, 18 Jul 2011 19:08:28 +0000 (-0700) Subject: Update PCKCONFIG file, fix include issue. X-Git-Tag: 0.51~1^2~5^2 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=f9bdaf620aab27a23bd4bb7b19d2597c3eef2c9c;p=m6w6%2Flibmemcached Update PCKCONFIG file, fix include issue. --- diff --git a/libtest/include.am b/libtest/include.am index ebc9adf7..be4f73ae 100644 --- 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 09741f48..03031f92 100644 --- 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}