Author: mahadev
Date: Thu Jul 16 23:17:07 2009
New Revision: 794903

URL: http://svn.apache.org/viewvc?rev=794903&view=rev
Log:
ZOOKEEPER-469. make sure CPPUNIT_CFLAGS isn't overwritten (chris via mahadev)

Modified:
    hadoop/zookeeper/branches/branch-3.2/CHANGES.txt
    hadoop/zookeeper/branches/branch-3.2/src/c/configure.ac

Modified: hadoop/zookeeper/branches/branch-3.2/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/CHANGES.txt?rev=794903&r1=794902&r2=794903&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.2/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.2/CHANGES.txt Thu Jul 16 23:17:07 2009
@@ -1,3 +1,17 @@
+Release 3.2.1
+
+Backward compatibile changes:
+
+BUGFIXES:
+  ZOOKEEPER-468. avoid compile warning in send_auth_info(). (chris via flavio)
+
+  ZOOKEEPER-469. make sure CPPUNIT_CFLAGS isn't overwritten (chris via mahadev)
+
+IMPROVEMENTS:
+
+NEW FEATURES:
+
+
 Release 3.2.0 - 2009-06-30
 
 Non-backward compatible changes:
@@ -156,8 +170,7 @@
   ZOOKEEPER-455. zookeeper c client crashes with chroot specified in the 
string.
   (phunt via mahadev)
 
-  ZOOKEEPER-468. avoid compile warning in send_auth_info(). (chris via flavio)
-
+  
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   (breed via mahadev)

Modified: hadoop/zookeeper/branches/branch-3.2/src/c/configure.ac
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.2/src/c/configure.ac?rev=794903&r1=794902&r2=794903&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.2/src/c/configure.ac (original)
+++ hadoop/zookeeper/branches/branch-3.2/src/c/configure.ac Thu Jul 16 23:17:07 
2009
@@ -34,9 +34,9 @@
 fi
 
 if test "$CALLER" = "ANT" ; then
-CPPUNIT_CFLAGS="-DZKSERVER_CMD=\"\\\"${base_dir}/src/c/tests/zkServer.sh\\\"\""
+CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS 
-DZKSERVER_CMD=\"\\\"${base_dir}/src/c/tests/zkServer.sh\\\"\""
 else
-CPPUNIT_CFLAGS="-DZKSERVER_CMD=\"\\\"./tests/zkServer.sh\\\"\""
+CPPUNIT_CFLAGS="$CPPUNIT_CFLAGS -DZKSERVER_CMD=\"\\\"./tests/zkServer.sh\\\"\""
 AC_CHECK_FILES([generated/zookeeper.jute.c generated/zookeeper.jute.h],[],
     [AC_MSG_ERROR([jute files are missing! Please run "ant compile_jute" while 
in the zookeeper top level directory.])
 ])


Reply via email to