Browse Source

ZOOKEEPER-273. Zookeeper c client build should not depend on CPPUNIT. (pat and runping via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@737769 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 16 years ago
parent
commit
b17e881ff0
3 changed files with 16 additions and 1 deletions
  1. 3 0
      CHANGES.txt
  2. 2 0
      src/c/README
  3. 11 1
      src/c/configure.ac

+ 3 - 0
CHANGES.txt

@@ -65,6 +65,9 @@ BUGFIXES:
  
   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:
    

+ 2 - 0
src/c/README

@@ -53,6 +53,8 @@ tar downloaded from Apache please skip to step 2.
                       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

+ 11 - 1
src/c/configure.ac

@@ -25,7 +25,17 @@ AM_INIT_AUTOMAKE([-Wall foreign])
 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