You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/08/23 23:03:58 UTC

svn commit: r1757450 - in /zookeeper/trunk: CHANGES.txt src/c/Makefile.am

Author: phunt
Date: Tue Aug 23 23:03:58 2016
New Revision: 1757450

URL: http://svn.apache.org/viewvc?rev=1757450&view=rev
Log:
ZOOKEEPER-2505: Use shared library instead of static library in C client unit test (Michael Han via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/c/Makefile.am

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1757450&r1=1757449&r2=1757450&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Aug 23 23:03:58 2016
@@ -475,6 +475,9 @@ IMPROVEMENTS:
   ZOOKEEPER-2433: ZooKeeperSaslServer: allow user principals in
   subject (Andy B via phunt)
 
+  ZOOKEEPER-2505: Use shared library instead of static library in C
+  client unit test (Michael Han via phunt)
+
 Release 3.5.0 - 8/4/2014
 
 NEW FEATURES:

Modified: zookeeper/trunk/src/c/Makefile.am
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/Makefile.am?rev=1757450&r1=1757449&r2=1757450&view=diff
==============================================================================
--- zookeeper/trunk/src/c/Makefile.am (original)
+++ zookeeper/trunk/src/c/Makefile.am Tue Aug 23 23:03:58 2016
@@ -115,7 +115,7 @@ TESTS_ENVIRONMENT = ZKROOT=${srcdir}/../
 nodist_zktest_st_SOURCES = $(TEST_SOURCES)
 zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS)
 zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) $(USEIPV6) $(SOLARIS_CPPFLAGS)
-zktest_st_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS) $(SOLARIS_LIB_LDFLAGS)
+zktest_st_LDFLAGS = -shared $(SYMBOL_WRAPPERS) $(SOLARIS_LIB_LDFLAGS)
 
 if WANT_SYNCAPI
   check_PROGRAMS += zktest-mt
@@ -128,7 +128,7 @@ if SOLARIS
 else
   SYMBOL_WRAPPERS_MT=$(SYMBOL_WRAPPERS) $(shell cat ${srcdir}/tests/wrappers-mt.opt)
 endif
-  zktest_mt_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS_MT) $(SOLARIS_LIB_LDFLAGS)
+  zktest_mt_LDFLAGS = -shared $(SYMBOL_WRAPPERS_MT) $(SOLARIS_LIB_LDFLAGS)
 endif
 
 TESTS = $(check_PROGRAMS)