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
|