From b4e0a7f4bff220b22ce75eed4311a6f1ad464e04 Mon Sep 17 00:00:00 2001
From: Norbert Kalmar <nkalmar@yahoo.com>
Date: Tue, 21 Aug 2018 07:30:53 +0200
Subject: [PATCH] ZOOKEEPER-3031 3.5: MAVEN MIGRATION - move client dir

---
 .gitignore                                    | 36 +++++++++----------
 build.xml                                     | 27 +++++++-------
 docs/zookeeperProgrammers.html                | 10 +++---
 .../zookeeper-client-c}/CMakeLists.txt        |  0
 .../zookeeper-client-c}/ChangeLog             |  0
 .../zookeeper-client-c}/INSTALL               |  0
 .../zookeeper-client-c}/LICENSE               |  0
 .../zookeeper-client-c}/Makefile.am           |  0
 .../zookeeper-client-c}/NOTICE.txt            |  0
 .../zookeeper-client-c}/README                |  7 ++--
 .../zookeeper-client-c}/acinclude.m4          |  0
 .../zookeeper-client-c}/aminclude.am          |  0
 .../zookeeper-client-c}/c-doc.Doxyfile        |  0
 .../zookeeper-client-c}/cmake_config.h.in     |  0
 .../zookeeper-client-c}/configure.ac          |  2 +-
 .../zookeeper-client-c}/include/proto.h       |  0
 .../zookeeper-client-c}/include/recordio.h    |  0
 .../zookeeper-client-c}/include/winconfig.h   |  0
 .../zookeeper-client-c}/include/zookeeper.h   |  0
 .../include/zookeeper_log.h                   |  0
 .../include/zookeeper_version.h               |  0
 .../zookeeper-client-c}/src/addrvec.c         |  0
 .../zookeeper-client-c}/src/addrvec.h         |  0
 .../zookeeper-client-c}/src/cli.c             |  0
 .../src/hashtable/LICENSE.txt                 |  0
 .../src/hashtable/hashtable.c                 |  0
 .../src/hashtable/hashtable.h                 |  0
 .../src/hashtable/hashtable_itr.c             |  0
 .../src/hashtable/hashtable_itr.h             |  0
 .../src/hashtable/hashtable_private.h         |  0
 .../zookeeper-client-c}/src/load_gen.c        |  0
 .../zookeeper-client-c}/src/mt_adaptor.c      |  0
 .../zookeeper-client-c}/src/recordio.c        |  0
 .../zookeeper-client-c}/src/st_adaptor.c      |  0
 .../zookeeper-client-c}/src/winport.c         |  0
 .../zookeeper-client-c}/src/winport.h         |  0
 .../zookeeper-client-c}/src/zk_adaptor.h      |  0
 .../zookeeper-client-c}/src/zk_hashtable.c    |  0
 .../zookeeper-client-c}/src/zk_hashtable.h    |  0
 .../zookeeper-client-c}/src/zk_log.c          |  0
 .../zookeeper-client-c}/src/zookeeper.c       |  0
 .../tests/CollectionUtil.h                    |  0
 .../tests/CppAssertHelper.h                   |  0
 .../zookeeper-client-c}/tests/LibCMocks.cc    |  0
 .../zookeeper-client-c}/tests/LibCMocks.h     |  0
 .../zookeeper-client-c}/tests/LibCSymTable.cc |  0
 .../zookeeper-client-c}/tests/LibCSymTable.h  |  0
 .../zookeeper-client-c}/tests/MocksBase.cc    |  0
 .../zookeeper-client-c}/tests/MocksBase.h     |  0
 .../zookeeper-client-c}/tests/PthreadMocks.cc |  0
 .../zookeeper-client-c}/tests/PthreadMocks.h  |  0
 .../zookeeper-client-c}/tests/TestClient.cc   |  0
 .../tests/TestClientRetry.cc                  |  0
 .../zookeeper-client-c}/tests/TestDriver.cc   |  0
 .../zookeeper-client-c}/tests/TestMulti.cc    |  0
 .../tests/TestOperations.cc                   |  0
 .../tests/TestReadOnlyClient.cc               |  0
 .../zookeeper-client-c}/tests/TestReconfig.cc |  0
 .../tests/TestReconfigServer.cc               |  0
 .../zookeeper-client-c}/tests/TestWatchers.cc |  0
 .../tests/TestZookeeperClose.cc               |  0
 .../tests/TestZookeeperInit.cc                |  0
 .../tests/ThreadingUtil.cc                    |  0
 .../zookeeper-client-c}/tests/ThreadingUtil.h |  0
 .../zookeeper-client-c}/tests/Util.cc         |  0
 .../zookeeper-client-c}/tests/Util.h          |  0
 .../zookeeper-client-c}/tests/Vector.h        |  0
 .../zookeeper-client-c}/tests/WatchUtil.h     |  0
 .../zookeeper-client-c}/tests/ZKMocks.cc      |  0
 .../zookeeper-client-c}/tests/ZKMocks.h       |  0
 .../tests/ZooKeeperQuorumServer.cc            |  0
 .../tests/ZooKeeperQuorumServer.h             |  0
 .../zookeeper-client-c}/tests/quorum.cfg      |  0
 .../zookeeper-client-c}/tests/wrappers-mt.opt |  0
 .../zookeeper-client-c}/tests/wrappers.opt    |  0
 .../zookeeper-client-c}/tests/zkServer.sh     |  2 +-
 .../src/python/setup.py                       |  8 ++---
 .../content/xdocs/zookeeperProgrammers.xml    | 10 +++---
 .../src/main/c/configure.ac                   |  4 +--
 .../src/main/c/configure.ac                   |  4 +--
 80 files changed, 56 insertions(+), 54 deletions(-)
 rename {src/c => zookeeper-client/zookeeper-client-c}/CMakeLists.txt (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/ChangeLog (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/INSTALL (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/LICENSE (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/Makefile.am (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/NOTICE.txt (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/README (96%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/acinclude.m4 (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/aminclude.am (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/c-doc.Doxyfile (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/cmake_config.h.in (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/configure.ac (98%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/proto.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/recordio.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/winconfig.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/zookeeper.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/zookeeper_log.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/include/zookeeper_version.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/addrvec.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/addrvec.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/cli.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/LICENSE.txt (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/hashtable.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/hashtable.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/hashtable_itr.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/hashtable_itr.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/hashtable/hashtable_private.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/load_gen.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/mt_adaptor.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/recordio.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/st_adaptor.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/winport.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/winport.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/zk_adaptor.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/zk_hashtable.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/zk_hashtable.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/zk_log.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/src/zookeeper.c (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/CollectionUtil.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/CppAssertHelper.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/LibCMocks.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/LibCMocks.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/LibCSymTable.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/LibCSymTable.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/MocksBase.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/MocksBase.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/PthreadMocks.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/PthreadMocks.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestClient.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestClientRetry.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestDriver.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestMulti.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestOperations.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestReadOnlyClient.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestReconfig.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestReconfigServer.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestWatchers.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestZookeeperClose.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/TestZookeeperInit.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ThreadingUtil.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ThreadingUtil.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/Util.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/Util.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/Vector.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/WatchUtil.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ZKMocks.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ZKMocks.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ZooKeeperQuorumServer.cc (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/ZooKeeperQuorumServer.h (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/quorum.cfg (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/wrappers-mt.opt (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/wrappers.opt (100%)
 rename {src/c => zookeeper-client/zookeeper-client-c}/tests/zkServer.sh (97%)

diff --git a/.gitignore b/.gitignore
index c5bd7f537a2..226df685664 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,24 +59,24 @@ tags
 .cproject
 .project
 obj
-src/c/core.*
-src/c/TEST-*.txt
-src/c/*.la
-src/c/*.lo
-src/c/*.o
-src/c/generated/
+zookeeper-client/zookeeper-client-c/core.*
+zookeeper-client/zookeeper-client-c/TEST-*.txt
+zookeeper-client/zookeeper-client-c/*.la
+zookeeper-client/zookeeper-client-c/*.lo
+zookeeper-client/zookeeper-client-c/*.o
+zookeeper-client/zookeeper-client-c/generated/
 src/java/generated/
 src/java/lib/ant-eclipse-*
 src/java/lib/ivy-*
-src/c/Makefile.in
-src/c/aclocal.m4
-src/c/autom4te.cache/
-src/c/compile
-src/c/config.guess
-src/c/config.h.in
-src/c/config.sub
-src/c/configure
-src/c/depcomp
-src/c/install-sh
-src/c/ltmain.sh
-src/c/missing
+zookeeper-client/zookeeper-client-c/Makefile.in
+zookeeper-client/zookeeper-client-c/aclocal.m4
+zookeeper-client/zookeeper-client-c/autom4te.cache/
+zookeeper-client/zookeeper-client-c/compile
+zookeeper-client/zookeeper-client-c/config.guess
+zookeeper-client/zookeeper-client-c/config.h.in
+zookeeper-client/zookeeper-client-c/config.sub
+zookeeper-client/zookeeper-client-c/configure
+zookeeper-client/zookeeper-client-c/depcomp
+zookeeper-client/zookeeper-client-c/install-sh
+zookeeper-client/zookeeper-client-c/ltmain.sh
+zookeeper-client/zookeeper-client-c/missing
diff --git a/build.xml b/build.xml
index 10215050250..f6246a74865 100644
--- a/build.xml
+++ b/build.xml
@@ -105,7 +105,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="build.dir" value="${basedir}/build" />
     <property name="distribution" value="${basedir}/distribution" />
     <property name="src_generated.dir" value="${src.dir}/java/generated" />
-    <property name="c.src.dir" value="${src.dir}/c" />    
+    <property name="c.src.dir" value="${basedir}/zookeeper-client/zookeeper-client-c" />
     <property name="csrc_generated.dir" value="${c.src.dir}/generated" />
 
     <property name="jute.file" value="${src.dir}/zookeeper.jute" />
@@ -346,7 +346,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}">
             <arg value="-l" />
             <arg value="c" />
-            <arg value="../../zookeeper.jute" />
+            <arg value="../../../src/zookeeper.jute" />
             <classpath>
                 <pathelement path="${build.classes}" />
             </classpath>
@@ -876,6 +876,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <include name="zookeeper-recipes/**"/>
           <include name="zookeeper-docs/**"/>
           <include name="zookeeper-contrib/**"/>
+          <include name="zookeeper-client/**"/>
         </fileset>
         <fileset file="src/pom.template"/>
       </copy>
@@ -1058,8 +1059,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <macro_tar param.destfile="${build.dir}/${final.name}-bin.tar.gz">
         <param.listofitems>
           <tarfileset dir="${build.dir}" mode="664">
-            <include name="${final.name}/src/c/**" />
-            <exclude name="${final.name}/src/c/generated/**" />
+            <include name="${final.name}/zookeeper-client/zookeeper-client-c/**" />
+            <exclude name="${final.name}/zookeeper-client/zookeeper-client-c/generated/**" />
           </tarfileset>
           <tarfileset dir="${build.dir}" mode="664">
             <exclude name="${final.name}/bin/*" />
@@ -1732,15 +1733,15 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
           <exclude name="**/zookeeper-docs/"/>
           <exclude name="**/lib/jdiff/"/>
           <exclude name="contrib/ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
-          <exclude name="src/c/*.la"/>
-          <exclude name="src/c/*.lo"/>
-          <exclude name="src/c/.libs/"/>
-          <exclude name="src/c/autom4te.cache/**"/>
-          <exclude name="src/c/config**"/>
-          <exclude name="src/c/include/winstdint.h"/>
-          <exclude name="src/c/src/hashtable/"/>
-          <exclude name="src/c/test-driver"/>
-          <exclude name="src/c/tests/quorum.cfg"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/*.la"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/*.lo"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/.libs/"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/test-driver"/>
+          <exclude name="src/zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
           <exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
diff --git a/docs/zookeeperProgrammers.html b/docs/zookeeperProgrammers.html
index fe2eb1d8a81..a78b89d3ba7 100644
--- a/docs/zookeeperProgrammers.html
+++ b/docs/zookeeperProgrammers.html
@@ -1602,7 +1602,7 @@ <h4>ZooKeeper C client API</h4>
 <div class="content">
 <p>This is a very simple example which is intended to show
         how to interact with ZooKeeper ACLs
-        specifically. See <span class="codefrag filename">.../trunk/src/c/src/cli.c</span>
+        specifically. See <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</span>
         for an example of a C client implementation</p>
       
 </div>
@@ -2106,14 +2106,14 @@ <h4>Installation</h4>
 <p>Run <span class="codefrag command">ant compile_jute</span> from the ZooKeeper
             top level directory (<span class="codefrag filename">.../trunk</span>).
             This will create a directory named "generated" under
-            <span class="codefrag filename">.../trunk/src/c</span>.</p>
+            <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c</span>.</p>
           
 </li>
 
           
 <li>
             
-<p>Change directory to the<span class="codefrag filename">.../trunk/src/c</span>
+<p>Change directory to the<span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c</span>
             and run <span class="codefrag command">autoreconf -if</span> to bootstrap <strong>autoconf</strong>, <strong>automake</strong> and <strong>libtool</strong>. Make sure you have <strong>autoconf version 2.59</strong> or greater installed.
             Skip to step<strong> 4</strong>.</p>
           
@@ -2124,7 +2124,7 @@ <h4>Installation</h4>
             
 <p>If you are building from a project source package,
             unzip/untar the source tarball and cd to the<span class="codefrag filename">
-            zookeeper-x.x.x/src/c</span> directory.</p>
+            zookeeper-x.x.x/zookeeper-client/zookeeper-client-c</span> directory.</p>
           
 </li>
 
@@ -2255,7 +2255,7 @@ <h4>Building Your Own C Client</h4>
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-<p>See <span class="codefrag filename">.../trunk/src/c/src/cli.c</span>
+<p>See <span class="codefrag filename">.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</span>
           for an example of a C client implementation</p>
         
 </div>
diff --git a/src/c/CMakeLists.txt b/zookeeper-client/zookeeper-client-c/CMakeLists.txt
similarity index 100%
rename from src/c/CMakeLists.txt
rename to zookeeper-client/zookeeper-client-c/CMakeLists.txt
diff --git a/src/c/ChangeLog b/zookeeper-client/zookeeper-client-c/ChangeLog
similarity index 100%
rename from src/c/ChangeLog
rename to zookeeper-client/zookeeper-client-c/ChangeLog
diff --git a/src/c/INSTALL b/zookeeper-client/zookeeper-client-c/INSTALL
similarity index 100%
rename from src/c/INSTALL
rename to zookeeper-client/zookeeper-client-c/INSTALL
diff --git a/src/c/LICENSE b/zookeeper-client/zookeeper-client-c/LICENSE
similarity index 100%
rename from src/c/LICENSE
rename to zookeeper-client/zookeeper-client-c/LICENSE
diff --git a/src/c/Makefile.am b/zookeeper-client/zookeeper-client-c/Makefile.am
similarity index 100%
rename from src/c/Makefile.am
rename to zookeeper-client/zookeeper-client-c/Makefile.am
diff --git a/src/c/NOTICE.txt b/zookeeper-client/zookeeper-client-c/NOTICE.txt
similarity index 100%
rename from src/c/NOTICE.txt
rename to zookeeper-client/zookeeper-client-c/NOTICE.txt
diff --git a/src/c/README b/zookeeper-client/zookeeper-client-c/README
similarity index 96%
rename from src/c/README
rename to zookeeper-client/zookeeper-client-c/README
index 995c963a09f..33b179bab71 100644
--- a/src/c/README
+++ b/zookeeper-client/zookeeper-client-c/README
@@ -39,9 +39,10 @@ follow the steps outlined below. If you're building from a release
 tar downloaded from Apache please skip to step 2.
 
 1) do a "ant compile_jute" from the zookeeper top level directory (.../trunk).
-   This will create a directory named "generated" under src/c.  Skip to step 3.
-2) unzip/untar the source tarball and cd to the zookeeper-x.x.x/src/c directory
-3) change directory to src/c and do a "autoreconf -if" to bootstrap
+   This will create a directory named "generated" under zookeeper-client/zookeeper-client-c.
+   Skip to step 3.
+2) unzip/untar the source tarball and cd to the zookeeper-x.x.x/zookeeper-client/zookeeper-client-c directory
+3) change directory to zookeeper-client/zookeeper-client-c and do a "autoreconf -if" to bootstrap
    autoconf, automake and libtool. Please make sure you have autoconf
    version 2.59 or greater installed. If cppunit is installed in a non-standard
    directory, you need to specify where to find cppunit.m4. For example, if
diff --git a/src/c/acinclude.m4 b/zookeeper-client/zookeeper-client-c/acinclude.m4
similarity index 100%
rename from src/c/acinclude.m4
rename to zookeeper-client/zookeeper-client-c/acinclude.m4
diff --git a/src/c/aminclude.am b/zookeeper-client/zookeeper-client-c/aminclude.am
similarity index 100%
rename from src/c/aminclude.am
rename to zookeeper-client/zookeeper-client-c/aminclude.am
diff --git a/src/c/c-doc.Doxyfile b/zookeeper-client/zookeeper-client-c/c-doc.Doxyfile
similarity index 100%
rename from src/c/c-doc.Doxyfile
rename to zookeeper-client/zookeeper-client-c/c-doc.Doxyfile
diff --git a/src/c/cmake_config.h.in b/zookeeper-client/zookeeper-client-c/cmake_config.h.in
similarity index 100%
rename from src/c/cmake_config.h.in
rename to zookeeper-client/zookeeper-client-c/cmake_config.h.in
diff --git a/src/c/configure.ac b/zookeeper-client/zookeeper-client-c/configure.ac
similarity index 98%
rename from src/c/configure.ac
rename to zookeeper-client/zookeeper-client-c/configure.ac
index 0db8a3a3539..f4ddd35c356 100644
--- a/src/c/configure.ac
+++ b/zookeeper-client/zookeeper-client-c/configure.ac
@@ -38,7 +38,7 @@ else
 fi
 
 if test "$CALLER" = "ANT" ; then
-CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"${base_dir}/src/c/tests/zkServer.sh\\\"\""
+CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"${base_dir}/zookeeper-client/zookeeper-client-c/tests/zkServer.sh\\\"\""
 else
 CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"./tests/zkServer.sh\\\"\""
 AC_CHECK_FILES([$srcdir/generated/zookeeper.jute.c $srcdir/generated/zookeeper.jute.h],[],
diff --git a/src/c/include/proto.h b/zookeeper-client/zookeeper-client-c/include/proto.h
similarity index 100%
rename from src/c/include/proto.h
rename to zookeeper-client/zookeeper-client-c/include/proto.h
diff --git a/src/c/include/recordio.h b/zookeeper-client/zookeeper-client-c/include/recordio.h
similarity index 100%
rename from src/c/include/recordio.h
rename to zookeeper-client/zookeeper-client-c/include/recordio.h
diff --git a/src/c/include/winconfig.h b/zookeeper-client/zookeeper-client-c/include/winconfig.h
similarity index 100%
rename from src/c/include/winconfig.h
rename to zookeeper-client/zookeeper-client-c/include/winconfig.h
diff --git a/src/c/include/zookeeper.h b/zookeeper-client/zookeeper-client-c/include/zookeeper.h
similarity index 100%
rename from src/c/include/zookeeper.h
rename to zookeeper-client/zookeeper-client-c/include/zookeeper.h
diff --git a/src/c/include/zookeeper_log.h b/zookeeper-client/zookeeper-client-c/include/zookeeper_log.h
similarity index 100%
rename from src/c/include/zookeeper_log.h
rename to zookeeper-client/zookeeper-client-c/include/zookeeper_log.h
diff --git a/src/c/include/zookeeper_version.h b/zookeeper-client/zookeeper-client-c/include/zookeeper_version.h
similarity index 100%
rename from src/c/include/zookeeper_version.h
rename to zookeeper-client/zookeeper-client-c/include/zookeeper_version.h
diff --git a/src/c/src/addrvec.c b/zookeeper-client/zookeeper-client-c/src/addrvec.c
similarity index 100%
rename from src/c/src/addrvec.c
rename to zookeeper-client/zookeeper-client-c/src/addrvec.c
diff --git a/src/c/src/addrvec.h b/zookeeper-client/zookeeper-client-c/src/addrvec.h
similarity index 100%
rename from src/c/src/addrvec.h
rename to zookeeper-client/zookeeper-client-c/src/addrvec.h
diff --git a/src/c/src/cli.c b/zookeeper-client/zookeeper-client-c/src/cli.c
similarity index 100%
rename from src/c/src/cli.c
rename to zookeeper-client/zookeeper-client-c/src/cli.c
diff --git a/src/c/src/hashtable/LICENSE.txt b/zookeeper-client/zookeeper-client-c/src/hashtable/LICENSE.txt
similarity index 100%
rename from src/c/src/hashtable/LICENSE.txt
rename to zookeeper-client/zookeeper-client-c/src/hashtable/LICENSE.txt
diff --git a/src/c/src/hashtable/hashtable.c b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c
similarity index 100%
rename from src/c/src/hashtable/hashtable.c
rename to zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.c
diff --git a/src/c/src/hashtable/hashtable.h b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.h
similarity index 100%
rename from src/c/src/hashtable/hashtable.h
rename to zookeeper-client/zookeeper-client-c/src/hashtable/hashtable.h
diff --git a/src/c/src/hashtable/hashtable_itr.c b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_itr.c
similarity index 100%
rename from src/c/src/hashtable/hashtable_itr.c
rename to zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_itr.c
diff --git a/src/c/src/hashtable/hashtable_itr.h b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_itr.h
similarity index 100%
rename from src/c/src/hashtable/hashtable_itr.h
rename to zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_itr.h
diff --git a/src/c/src/hashtable/hashtable_private.h b/zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_private.h
similarity index 100%
rename from src/c/src/hashtable/hashtable_private.h
rename to zookeeper-client/zookeeper-client-c/src/hashtable/hashtable_private.h
diff --git a/src/c/src/load_gen.c b/zookeeper-client/zookeeper-client-c/src/load_gen.c
similarity index 100%
rename from src/c/src/load_gen.c
rename to zookeeper-client/zookeeper-client-c/src/load_gen.c
diff --git a/src/c/src/mt_adaptor.c b/zookeeper-client/zookeeper-client-c/src/mt_adaptor.c
similarity index 100%
rename from src/c/src/mt_adaptor.c
rename to zookeeper-client/zookeeper-client-c/src/mt_adaptor.c
diff --git a/src/c/src/recordio.c b/zookeeper-client/zookeeper-client-c/src/recordio.c
similarity index 100%
rename from src/c/src/recordio.c
rename to zookeeper-client/zookeeper-client-c/src/recordio.c
diff --git a/src/c/src/st_adaptor.c b/zookeeper-client/zookeeper-client-c/src/st_adaptor.c
similarity index 100%
rename from src/c/src/st_adaptor.c
rename to zookeeper-client/zookeeper-client-c/src/st_adaptor.c
diff --git a/src/c/src/winport.c b/zookeeper-client/zookeeper-client-c/src/winport.c
similarity index 100%
rename from src/c/src/winport.c
rename to zookeeper-client/zookeeper-client-c/src/winport.c
diff --git a/src/c/src/winport.h b/zookeeper-client/zookeeper-client-c/src/winport.h
similarity index 100%
rename from src/c/src/winport.h
rename to zookeeper-client/zookeeper-client-c/src/winport.h
diff --git a/src/c/src/zk_adaptor.h b/zookeeper-client/zookeeper-client-c/src/zk_adaptor.h
similarity index 100%
rename from src/c/src/zk_adaptor.h
rename to zookeeper-client/zookeeper-client-c/src/zk_adaptor.h
diff --git a/src/c/src/zk_hashtable.c b/zookeeper-client/zookeeper-client-c/src/zk_hashtable.c
similarity index 100%
rename from src/c/src/zk_hashtable.c
rename to zookeeper-client/zookeeper-client-c/src/zk_hashtable.c
diff --git a/src/c/src/zk_hashtable.h b/zookeeper-client/zookeeper-client-c/src/zk_hashtable.h
similarity index 100%
rename from src/c/src/zk_hashtable.h
rename to zookeeper-client/zookeeper-client-c/src/zk_hashtable.h
diff --git a/src/c/src/zk_log.c b/zookeeper-client/zookeeper-client-c/src/zk_log.c
similarity index 100%
rename from src/c/src/zk_log.c
rename to zookeeper-client/zookeeper-client-c/src/zk_log.c
diff --git a/src/c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c
similarity index 100%
rename from src/c/src/zookeeper.c
rename to zookeeper-client/zookeeper-client-c/src/zookeeper.c
diff --git a/src/c/tests/CollectionUtil.h b/zookeeper-client/zookeeper-client-c/tests/CollectionUtil.h
similarity index 100%
rename from src/c/tests/CollectionUtil.h
rename to zookeeper-client/zookeeper-client-c/tests/CollectionUtil.h
diff --git a/src/c/tests/CppAssertHelper.h b/zookeeper-client/zookeeper-client-c/tests/CppAssertHelper.h
similarity index 100%
rename from src/c/tests/CppAssertHelper.h
rename to zookeeper-client/zookeeper-client-c/tests/CppAssertHelper.h
diff --git a/src/c/tests/LibCMocks.cc b/zookeeper-client/zookeeper-client-c/tests/LibCMocks.cc
similarity index 100%
rename from src/c/tests/LibCMocks.cc
rename to zookeeper-client/zookeeper-client-c/tests/LibCMocks.cc
diff --git a/src/c/tests/LibCMocks.h b/zookeeper-client/zookeeper-client-c/tests/LibCMocks.h
similarity index 100%
rename from src/c/tests/LibCMocks.h
rename to zookeeper-client/zookeeper-client-c/tests/LibCMocks.h
diff --git a/src/c/tests/LibCSymTable.cc b/zookeeper-client/zookeeper-client-c/tests/LibCSymTable.cc
similarity index 100%
rename from src/c/tests/LibCSymTable.cc
rename to zookeeper-client/zookeeper-client-c/tests/LibCSymTable.cc
diff --git a/src/c/tests/LibCSymTable.h b/zookeeper-client/zookeeper-client-c/tests/LibCSymTable.h
similarity index 100%
rename from src/c/tests/LibCSymTable.h
rename to zookeeper-client/zookeeper-client-c/tests/LibCSymTable.h
diff --git a/src/c/tests/MocksBase.cc b/zookeeper-client/zookeeper-client-c/tests/MocksBase.cc
similarity index 100%
rename from src/c/tests/MocksBase.cc
rename to zookeeper-client/zookeeper-client-c/tests/MocksBase.cc
diff --git a/src/c/tests/MocksBase.h b/zookeeper-client/zookeeper-client-c/tests/MocksBase.h
similarity index 100%
rename from src/c/tests/MocksBase.h
rename to zookeeper-client/zookeeper-client-c/tests/MocksBase.h
diff --git a/src/c/tests/PthreadMocks.cc b/zookeeper-client/zookeeper-client-c/tests/PthreadMocks.cc
similarity index 100%
rename from src/c/tests/PthreadMocks.cc
rename to zookeeper-client/zookeeper-client-c/tests/PthreadMocks.cc
diff --git a/src/c/tests/PthreadMocks.h b/zookeeper-client/zookeeper-client-c/tests/PthreadMocks.h
similarity index 100%
rename from src/c/tests/PthreadMocks.h
rename to zookeeper-client/zookeeper-client-c/tests/PthreadMocks.h
diff --git a/src/c/tests/TestClient.cc b/zookeeper-client/zookeeper-client-c/tests/TestClient.cc
similarity index 100%
rename from src/c/tests/TestClient.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestClient.cc
diff --git a/src/c/tests/TestClientRetry.cc b/zookeeper-client/zookeeper-client-c/tests/TestClientRetry.cc
similarity index 100%
rename from src/c/tests/TestClientRetry.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestClientRetry.cc
diff --git a/src/c/tests/TestDriver.cc b/zookeeper-client/zookeeper-client-c/tests/TestDriver.cc
similarity index 100%
rename from src/c/tests/TestDriver.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestDriver.cc
diff --git a/src/c/tests/TestMulti.cc b/zookeeper-client/zookeeper-client-c/tests/TestMulti.cc
similarity index 100%
rename from src/c/tests/TestMulti.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestMulti.cc
diff --git a/src/c/tests/TestOperations.cc b/zookeeper-client/zookeeper-client-c/tests/TestOperations.cc
similarity index 100%
rename from src/c/tests/TestOperations.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestOperations.cc
diff --git a/src/c/tests/TestReadOnlyClient.cc b/zookeeper-client/zookeeper-client-c/tests/TestReadOnlyClient.cc
similarity index 100%
rename from src/c/tests/TestReadOnlyClient.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestReadOnlyClient.cc
diff --git a/src/c/tests/TestReconfig.cc b/zookeeper-client/zookeeper-client-c/tests/TestReconfig.cc
similarity index 100%
rename from src/c/tests/TestReconfig.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestReconfig.cc
diff --git a/src/c/tests/TestReconfigServer.cc b/zookeeper-client/zookeeper-client-c/tests/TestReconfigServer.cc
similarity index 100%
rename from src/c/tests/TestReconfigServer.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestReconfigServer.cc
diff --git a/src/c/tests/TestWatchers.cc b/zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc
similarity index 100%
rename from src/c/tests/TestWatchers.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestWatchers.cc
diff --git a/src/c/tests/TestZookeeperClose.cc b/zookeeper-client/zookeeper-client-c/tests/TestZookeeperClose.cc
similarity index 100%
rename from src/c/tests/TestZookeeperClose.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestZookeeperClose.cc
diff --git a/src/c/tests/TestZookeeperInit.cc b/zookeeper-client/zookeeper-client-c/tests/TestZookeeperInit.cc
similarity index 100%
rename from src/c/tests/TestZookeeperInit.cc
rename to zookeeper-client/zookeeper-client-c/tests/TestZookeeperInit.cc
diff --git a/src/c/tests/ThreadingUtil.cc b/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.cc
similarity index 100%
rename from src/c/tests/ThreadingUtil.cc
rename to zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.cc
diff --git a/src/c/tests/ThreadingUtil.h b/zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h
similarity index 100%
rename from src/c/tests/ThreadingUtil.h
rename to zookeeper-client/zookeeper-client-c/tests/ThreadingUtil.h
diff --git a/src/c/tests/Util.cc b/zookeeper-client/zookeeper-client-c/tests/Util.cc
similarity index 100%
rename from src/c/tests/Util.cc
rename to zookeeper-client/zookeeper-client-c/tests/Util.cc
diff --git a/src/c/tests/Util.h b/zookeeper-client/zookeeper-client-c/tests/Util.h
similarity index 100%
rename from src/c/tests/Util.h
rename to zookeeper-client/zookeeper-client-c/tests/Util.h
diff --git a/src/c/tests/Vector.h b/zookeeper-client/zookeeper-client-c/tests/Vector.h
similarity index 100%
rename from src/c/tests/Vector.h
rename to zookeeper-client/zookeeper-client-c/tests/Vector.h
diff --git a/src/c/tests/WatchUtil.h b/zookeeper-client/zookeeper-client-c/tests/WatchUtil.h
similarity index 100%
rename from src/c/tests/WatchUtil.h
rename to zookeeper-client/zookeeper-client-c/tests/WatchUtil.h
diff --git a/src/c/tests/ZKMocks.cc b/zookeeper-client/zookeeper-client-c/tests/ZKMocks.cc
similarity index 100%
rename from src/c/tests/ZKMocks.cc
rename to zookeeper-client/zookeeper-client-c/tests/ZKMocks.cc
diff --git a/src/c/tests/ZKMocks.h b/zookeeper-client/zookeeper-client-c/tests/ZKMocks.h
similarity index 100%
rename from src/c/tests/ZKMocks.h
rename to zookeeper-client/zookeeper-client-c/tests/ZKMocks.h
diff --git a/src/c/tests/ZooKeeperQuorumServer.cc b/zookeeper-client/zookeeper-client-c/tests/ZooKeeperQuorumServer.cc
similarity index 100%
rename from src/c/tests/ZooKeeperQuorumServer.cc
rename to zookeeper-client/zookeeper-client-c/tests/ZooKeeperQuorumServer.cc
diff --git a/src/c/tests/ZooKeeperQuorumServer.h b/zookeeper-client/zookeeper-client-c/tests/ZooKeeperQuorumServer.h
similarity index 100%
rename from src/c/tests/ZooKeeperQuorumServer.h
rename to zookeeper-client/zookeeper-client-c/tests/ZooKeeperQuorumServer.h
diff --git a/src/c/tests/quorum.cfg b/zookeeper-client/zookeeper-client-c/tests/quorum.cfg
similarity index 100%
rename from src/c/tests/quorum.cfg
rename to zookeeper-client/zookeeper-client-c/tests/quorum.cfg
diff --git a/src/c/tests/wrappers-mt.opt b/zookeeper-client/zookeeper-client-c/tests/wrappers-mt.opt
similarity index 100%
rename from src/c/tests/wrappers-mt.opt
rename to zookeeper-client/zookeeper-client-c/tests/wrappers-mt.opt
diff --git a/src/c/tests/wrappers.opt b/zookeeper-client/zookeeper-client-c/tests/wrappers.opt
similarity index 100%
rename from src/c/tests/wrappers.opt
rename to zookeeper-client/zookeeper-client-c/tests/wrappers.opt
diff --git a/src/c/tests/zkServer.sh b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh
similarity index 97%
rename from src/c/tests/zkServer.sh
rename to zookeeper-client/zookeeper-client-c/tests/zkServer.sh
index 64e5a04919a..9ca0401bd20 100755
--- a/src/c/tests/zkServer.sh
+++ b/zookeeper-client/zookeeper-client-c/tests/zkServer.sh
@@ -161,7 +161,7 @@ startReadOnly)
         mkdir -p "${tmpdir}/zkdata"
         rm -f "${tmpdir}/zkdata/myid" && echo 1 > "${tmpdir}/zkdata/myid"
 
-        sed "s#TMPDIR#${tmpdir}#g" ${base_dir}/src/c/tests/quorum.cfg > "${tmpdir}/quorum.cfg"
+        sed "s#TMPDIR#${tmpdir}#g" ${base_dir}/zookeeper-client/zookeeper-client-c/tests/quorum.cfg > "${tmpdir}/quorum.cfg"
 
         # force read-only mode
         java -cp "$CLASSPATH" -Dreadonlymode.enabled=true org.apache.zookeeper.server.quorum.QuorumPeerMain ${tmpdir}/quorum.cfg &> "${tmpdir}/zk.log" &
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
index c6a1ceefba6..d9fa36ba107 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
@@ -19,12 +19,12 @@
 zookeeper_basedir = "../../../"
 
 zookeepermodule = Extension("zookeeper",
-                            sources=["src/c/zookeeper.c"],
-                            include_dirs=[zookeeper_basedir + "/src/c/include",
+                            sources=["zookeeper-client/zookeeper-client-c/zookeeper.c"],
+                            include_dirs=[zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/include",
                                           zookeeper_basedir + "/build/c",
-                                          zookeeper_basedir + "/src/c/generated"],
+                                          zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/generated"],
                             libraries=["zookeeper_mt"],
-                            library_dirs=[zookeeper_basedir + "/src/c/.libs/",
+                            library_dirs=[zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/.libs/",
                                           zookeeper_basedir + "/build/c/.libs/",
                                           zookeeper_basedir + "/build/test/test-cppunit/.libs",
                                           "/usr/local/lib"
diff --git a/zookeeper-docs/src/documentation/content/xdocs/zookeeperProgrammers.xml b/zookeeper-docs/src/documentation/content/xdocs/zookeeperProgrammers.xml
index 42164638df9..903b469857c 100644
--- a/zookeeper-docs/src/documentation/content/xdocs/zookeeperProgrammers.xml
+++ b/zookeeper-docs/src/documentation/content/xdocs/zookeeperProgrammers.xml
@@ -1046,7 +1046,7 @@
 
       <note><para>This is a very simple example which is intended to show
         how to interact with ZooKeeper ACLs
-        specifically. See <filename>.../trunk/src/c/src/cli.c</filename>
+        specifically. See <filename>.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</filename>
         for an example of a C client implementation</para>
       </note>
 
@@ -1562,11 +1562,11 @@ authProvider.2=com.f.MyAuth2
             <para>Run <command>ant compile_jute</command> from the ZooKeeper
             top level directory (<filename>.../trunk</filename>).
             This will create a directory named "generated" under
-            <filename>.../trunk/src/c</filename>.</para>
+            <filename>.../trunk/zookeeper-client/zookeeper-client-c</filename>.</para>
           </listitem>
 
           <listitem>
-            <para>Change directory to the<filename>.../trunk/src/c</filename>
+            <para>Change directory to the<filename>.../trunk/zookeeper-client/zookeeper-client-c</filename>
             and run <command>autoreconf -if</command> to bootstrap <emphasis
             role="bold">autoconf</emphasis>, <emphasis
             role="bold">automake</emphasis> and <emphasis
@@ -1578,7 +1578,7 @@ authProvider.2=com.f.MyAuth2
           <listitem>
             <para>If you are building from a project source package,
             unzip/untar the source tarball and cd to the<filename>
-            zookeeper-x.x.x/src/c</filename> directory.</para>
+            zookeeper-x.x.x/zookeeper-client/zookeeper-client-c</filename> directory.</para>
           </listitem>
 
           <listitem>
@@ -1661,7 +1661,7 @@ authProvider.2=com.f.MyAuth2
           </listitem>
         </orderedlist>
 
-        <note><para>See <filename>.../trunk/src/c/src/cli.c</filename>
+        <note><para>See <filename>.../trunk/zookeeper-client/zookeeper-client-c/src/cli.c</filename>
           for an example of a C client implementation</para>
         </note>
       </section>
diff --git a/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac
index 3954123ee77..31c5406e3d4 100644
--- a/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac
+++ b/zookeeper-recipes/zookeeper-recipes-lock/src/main/c/configure.ac
@@ -48,8 +48,8 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN([zookeeper-locks],[c-doc.Doxyfile],[docs])
 
   
-ZOOKEEPER_PATH=${BUILD_PATH}/../../../../../src/c
-ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../../src/c\ -lzookeeper_mt
+ZOOKEEPER_PATH=${BUILD_PATH}/../../../../zookeeper-client/zookeeper-client-c
+ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../zookeeper-client/zookeeper-client-c\ -lzookeeper_mt
 
 AC_SUBST(ZOOKEEPER_PATH)
 AC_SUBST(ZOOKEEPER_LD)
diff --git a/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac
index a9fb7b13087..23fa8c95d7d 100644
--- a/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac
+++ b/zookeeper-recipes/zookeeper-recipes-queue/src/main/c/configure.ac
@@ -48,8 +48,8 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN([zookeeper-queues],[c-doc.Doxyfile],[docs])
 
   
-ZOOKEEPER_PATH=${BUILD_PATH}/../../../../../src/c
-ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../../src/c\ -lzookeeper_mt
+ZOOKEEPER_PATH=${BUILD_PATH}/../../../../zookeeper-client/zookeeper-client-c
+ZOOKEEPER_LD=-L${BUILD_PATH}/../../../../zookeeper-client/zookeeper-client-c\ -lzookeeper_mt
 
 AC_SUBST(ZOOKEEPER_PATH)
 AC_SUBST(ZOOKEEPER_LD)