Merge.

diff --git a/ChangeLog b/ChangeLog
index 3434f8ddcba4ca5a723441c4563f615834868747..c3f63371f1b207277452046ee9d8fa6fd993883c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+
+  * Problem configuring (PKG_CHECK_MODULES) fixed by removal of "rpath" in 
+    support/libmemcached.pc.in (Thanks to Ross McFarland).
   * Added memcached_callback_get()/set()
   * First prototype of C++ interface
   * Updated docs for uint16_t changes in previous release

diff --git a/support/libmemcached.pc.in b/support/libmemcached.pc.in
index dfcc0c225a27ec1d05cfdf2b671ccc362d7745e2..cb9d8c38326af47909e5933073c951ed30117c9f 100644 (file)
--- a/support/libmemcached.pc.in
+++ b/support/libmemcached.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libmemcached
 Description: libmemcached C library.
 Version: @VERSION@
-Libs: -L${libdir} -lmemcached -rpath $(libdir)
+Libs: -L${libdir} -lmemcached
 Cflags: -I${includedir}/@MEMCACHED_LIBRARY_NAME@