Author: mahadev
Date: Thu Jul 16 23:09:22 2009
New Revision: 794899
URL: http://svn.apache.org/viewvc?rev=794899&view=rev
Log:
ZOOKEEPER-469. make sure CPPUNIT_CFLAGS isn't overwritten (chris via mahadev)
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
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=794899&r1=794898&r2=794899&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Thu Jul 16 23:09:22 2009
@@ -7,6 +7,8 @@
Backward compatible changes:
BUGFIXES:
+ ZOOKEEPER-469. make sure CPPUNIT_CFLAGS isn't overwritten (chris via
+mahadev)
IMPROVEMENTS:
ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
Modified: hadoop/zookeeper/trunk/src/c/configure.ac
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/configure.ac?rev=794899&r1=794898&r2=794899&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/c/configure.ac (original)
+++ hadoop/zookeeper/trunk/src/c/configure.ac Thu Jul 16 23:09:22 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.])
])
