Return-Path: Delivered-To: apmail-hadoop-zookeeper-commits-archive@locus.apache.org Received: (qmail 2085 invoked from network); 26 Jan 2009 17:56:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jan 2009 17:56:51 -0000 Received: (qmail 54622 invoked by uid 500); 26 Jan 2009 17:56:51 -0000 Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org Received: (qmail 54568 invoked by uid 500); 26 Jan 2009 17:56:51 -0000 Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: zookeeper-dev@ Delivered-To: mailing list zookeeper-commits@hadoop.apache.org Received: (qmail 54539 invoked by uid 99); 26 Jan 2009 17:56:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 09:56:51 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jan 2009 17:56:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B0F923888E6; Mon, 26 Jan 2009 17:56:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r737769 - in /hadoop/zookeeper/trunk: CHANGES.txt src/c/README src/c/configure.ac Date: Mon, 26 Jan 2009 17:56:23 -0000 To: zookeeper-commits@hadoop.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090126175623.4B0F923888E6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mahadev Date: Mon Jan 26 17:56:22 2009 New Revision: 737769 URL: http://svn.apache.org/viewvc?rev=737769&view=rev Log: ZOOKEEPER-273. Zookeeper c client build should not depend on CPPUNIT. (pat and runping via mahadev) Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/README hadoop/zookeeper/trunk/src/c/configure.ac Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=737769&r1=737768&r2=737769&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Mon Jan 26 17:56:22 2009 @@ -65,6 +65,9 @@ ZOOKEEPER-265. remove (deprecate) unused NoSyncConnected from KeeperState. (phunt via mahadev) + + ZOOKEEPER-273. Zookeeper c client build should not depend on CPPUNIT. (pat +and runping via mahadev) IMPROVEMENTS: Modified: hadoop/zookeeper/trunk/src/c/README URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/README?rev=737769&r1=737768&r2=737769&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/README (original) +++ hadoop/zookeeper/trunk/src/c/README Mon Jan 26 17:56:22 2009 @@ -53,6 +53,8 @@ be built, enabled by default --disable-static do not build static libraries, enabled by default --disable-shared do not build shared libraries, enabled by default + --without-cppunit do not build the test library, enabled by default. + 5) do a "make" or "make install" to build the libraries and install them. Alternatively, you can also build and run a unit test suite (and you probably should). Please make sure you have cppunit-1.10.x or Modified: hadoop/zookeeper/trunk/src/c/configure.ac URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/configure.ac?rev=737769&r1=737768&r2=737769&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/configure.ac (original) +++ hadoop/zookeeper/trunk/src/c/configure.ac Mon Jan 26 17:56:22 2009 @@ -25,7 +25,17 @@ AC_CONFIG_HEADER([config.h]) # Checks for programs. -AM_PATH_CPPUNIT(1.10.2) +AC_ARG_WITH(cppunit, + [ --without-cppunit do not use CPPUNIT]) + +if test "$with_cppunit" = "no" ; then + CPPUNIT_PATH="No_CPPUNIT" + CPPUNIT_INCLUDE= + CPPUNIT_LIBS= +else + AM_PATH_CPPUNIT(1.10.2) +fi + AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX