From fa543a0643aafcd5042080ca060f0418b95eb8ca Mon Sep 17 00:00:00 2001
From: Brian Aker <brian@tangent.org>
Date: Mon, 5 Nov 2007 11:36:50 -0800
Subject: [PATCH] Fixup for release

---
 ChangeLog                 | 4 ++--
 configure.ac              | 2 +-
 docs/libmemcached.pod     | 8 ++++++++
 lib/Makefile.am           | 2 +-
 support/libmemcached.spec | 5 +++--
 tests/Makefile.am         | 1 +
 tests/test.c              | 2 --
 tests/test.h              | 3 +++
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff7e498e..170f7378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
-0.8
+0.8 Mon Nov  5 10:40:41 PST 2007
   * Adding support for CRC hash method 
   * Adding support for UNIX sockets
   * Added additional HASHing methods of FNV1_64,FNV1A_64, FNV1_32, FNV1A_32
-  * Added pkgconfig support
+  * Added pkgconfig support (PKG_CHECK_MODULES)
   * Fixed conflict with defined type in MySQL
   * Added memcached_result_st structure and functions to manipulate it.
 
diff --git a/configure.ac b/configure.ac
index 5d392ca3..54360a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ MEMCACHED_RELEASE=$MEMCACHED_MAJOR_VERSION.$MEMCACHED_MINOR_VERSION
 AC_SUBST(MEMCACHED_RELEASE)
 AC_SUBST(MEMCACHED_VERSION)
 
-VERSION=$MEMCACHED_VERSION
+VERSION=$MEMCACHED_RELEASE
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 
diff --git a/docs/libmemcached.pod b/docs/libmemcached.pod
index 36079ba5..158af960 100755
--- a/docs/libmemcached.pod
+++ b/docs/libmemcached.pod
@@ -40,7 +40,15 @@ contain its own structure (that is, if you want to share these among
 threads you must provide your own locking). No global variables are
 used in this library.
 
+If you are working with GNU autotools you will want to add the following to
+your configure.ac to properly include libmemcached in your application. 
+
+PKG_CHECK_MODULES(DEPS, libmemcached >= 0.8.0)
+AC_SUBST(DEPS_CFLAGS)
+AC_SUBST(DEPS_LIBS)
+
 Some features of the library must be enabled through memcached_behavior_set(). 
+
 Hope you enjoy it!
 
 =head1 HOME
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 592897e7..a84f43f5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -47,7 +47,7 @@ libmemcached_la_SOURCES = crc.c \
                           memcached_strerror.c \
 			  memcached_verbosity.c 
 libmemcached_la_LIBADD =
-libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) -release $(MEMCACHED_RELEASE)
+libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION)
 
 if HAVE_DTRACE
   libmemcached_la_LIBADD += libmemcached_probes.o
diff --git a/support/libmemcached.spec b/support/libmemcached.spec
index 90873440..e72aa489 100644
--- a/support/libmemcached.spec
+++ b/support/libmemcached.spec
@@ -51,8 +51,9 @@ memcp - Copy files to memcached servers.
 %{_libdir}/libmemcached.a
 %{_libdir}/libmemcached.la
 %{_libdir}/libmemcached.so
-%{_libdir}/libmemcached.so.0
-%{_libdir}/libmemcached.so.0.0.0
+%{_libdir}/libmemcached.so.1
+%{_libdir}/libmemcached.so.1.0.0
+%{_libdir}/pkgconfig/libmemcached.pc
 %{_mandir}/man1/memcat.1.gz
 %{_mandir}/man1/memcp.1.gz
 %{_mandir}/man1/memflush.1.gz
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fe85aed8..903eb0ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
+noinst_HEADERS = test.h
 noinst_PROGRAMS = testapp
 
 testapp_SOURCES = test.c function.c
diff --git a/tests/test.c b/tests/test.c
index d31f8bc5..e7e16f54 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -2,7 +2,6 @@
   Sample test application.
 */
 #include <assert.h>
-#include <memcached.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -11,7 +10,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
-#include "../lib/common.h"
 
 #include "test.h"
 
diff --git a/tests/test.h b/tests/test.h
index 88e62800..de9d6de2 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,6 +1,9 @@
 /*
   Structures for generic tests.
 */
+#include <memcached.h>
+#include "../lib/common.h"
+
 typedef struct collection_st collection_st;
 typedef struct test_st test_st;
 
-- 
2.30.2