From 945be4901bee5aad1c6b62a12b9ac91e852f0405 Mon Sep 17 00:00:00 2001
From: Trond Norbye <trond.norbye@sun.com>
Date: Mon, 5 Oct 2009 20:37:05 +0200
Subject: [PATCH] Move libmemcachedutil to libmemcached/util where it belongs

---
 Makefile.am                                   |  2 +-
 configure.ac                                  |  3 +--
 libmemcached/Makefile.am                      | 22 ++++++++++++++-----
 .../util}/Makefile.am                         |  0
 .../util}/libmemcachedutil.ver                |  0
 .../util}/memcached_pool.c                    |  0
 tests/Makefile.am                             |  2 +-
 7 files changed, 19 insertions(+), 10 deletions(-)
 rename {libmemcachedutil => libmemcached/util}/Makefile.am (100%)
 rename {libmemcachedutil => libmemcached/util}/libmemcachedutil.ver (100%)
 rename {libmemcachedutil => libmemcached/util}/memcached_pool.c (100%)

diff --git a/Makefile.am b/Makefile.am
index affdae19..eeab710a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = docs libmemcached libmemcachedutil support clients tests example
+SUBDIRS = docs libmemcached support clients tests example
 EXTRA_dist = README.FIRST
 
 check-local: test-no-outputdiff
diff --git a/configure.ac b/configure.ac
index 0601a175..951edfbf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_SUBST(MEMCACHEDPROTOCOL_LIBRARY_VERSION)
 if test "$lt_cv_prog_gnu_ld" = "yes"
 then
     LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/libmemcached.ver"
-    LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcachedutil/libmemcachedutil.ver"
+    LD_UTIL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/util/libmemcachedutil.ver"
     LD_PROTOCOL_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/libmemcached/protocol/libmemcachedprotocol.ver"
 fi
 AC_SUBST(LD_VERSION_SCRIPT)
@@ -94,7 +94,6 @@ AC_CONFIG_FILES([
   example/Makefile
   libmemcached/Makefile
   libmemcached/memcached_configure.h
-  libmemcachedutil/Makefile
   support/Makefile
   support/libmemcached.pc
   support/libmemcached.spec
diff --git a/libmemcached/Makefile.am b/libmemcached/Makefile.am
index ef9d0cd8..ac9aa101 100644
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@ -1,5 +1,9 @@
-EXTRA_DIST = libmemcached_probes.d memcached/README.txt libmemcached.ver \
-             memcached_configure.h.in protocol/libmemcachedprotocol.ver
+EXTRA_DIST = libmemcached.ver \
+             libmemcached_probes.d \
+             memcached/README.txt \
+             memcached_configure.h.in \
+             protocol/libmemcachedprotocol.ver \
+             util/libmemcachedutil.ver
 
 
 EXTRA_HEADERS =
@@ -33,10 +37,6 @@ nobase_pkginclude_HEADERS=protocol/cache.h \
                           protocol/callback.h
 
 
-if BUILD_LIBMEMCACHEDUTIL
-pkginclude_HEADERS+= memcached_util.h memcached_pool.h
-endif
-
 libmemcachedprotocol_la_SOURCES= protocol/ascii_handler.c \
                                  protocol/binary_handler.c \
                                  protocol/cache.c \
@@ -94,6 +94,16 @@ libmemcached_la_DEPENDENCIES= libmemcachedcallbacks.la
 libmemcached_la_LIBADD= $(LIBM) libmemcachedcallbacks.la
 libmemcached_la_LDFLAGS = -version-info $(MEMCACHED_LIBRARY_VERSION) $(LD_VERSION_SCRIPT) $(LIBM)
 
+if BUILD_LIBMEMCACHEDUTIL
+pkginclude_HEADERS+= memcached_util.h memcached_pool.h
+lib_LTLIBRARIES+= libmemcachedutil.la
+endif
+
+libmemcachedutil_la_SOURCES= util/memcached_pool.c
+libmemcachedutil_la_LDFLAGS= -version-info $(MEMCACHEDUTIL_LIBRARY_VERSION) $(LD_UTIL_VERSION_SCRIPT)
+libmemcachedutil_la_LIBADD= libmemcached.la
+libmemcachedutil_la_DEPENDENCIES=libmemcached.la
+
 if BUILD_BYTEORDER
 noinst_LTLIBRARIES += libbyteorder.la
 libbyteorder_la_SOURCES= byteorder.c byteorder.h
diff --git a/libmemcachedutil/Makefile.am b/libmemcached/util/Makefile.am
similarity index 100%
rename from libmemcachedutil/Makefile.am
rename to libmemcached/util/Makefile.am
diff --git a/libmemcachedutil/libmemcachedutil.ver b/libmemcached/util/libmemcachedutil.ver
similarity index 100%
rename from libmemcachedutil/libmemcachedutil.ver
rename to libmemcached/util/libmemcachedutil.ver
diff --git a/libmemcachedutil/memcached_pool.c b/libmemcached/util/memcached_pool.c
similarity index 100%
rename from libmemcachedutil/memcached_pool.c
rename to libmemcached/util/memcached_pool.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d9a1f7e6..77ba5dee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 LDADDS = $(top_builddir)/libmemcached/libmemcached.la
 
 if BUILD_LIBMEMCACHEDUTIL
-LDADDS+= $(top_builddir)/libmemcachedutil/libmemcachedutil.la
+LDADDS+= $(top_builddir)/libmemcached/libmemcachedutil.la
 endif
 
 EXTRA_DIST = output.res output2.res\
-- 
2.30.2