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:04:31 UTC

svn commit: r1757451 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/c/Makefile.am

Author: phunt
Date: Tue Aug 23 23:04:31 2016
New Revision: 1757451

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

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/c/Makefile.am

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1757451&r1=1757450&r2=1757451&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Tue Aug 23 23:04:31 2016
@@ -27,6 +27,9 @@ BUGFIXES:
   
 IMPROVEMENTS:
 
+  ZOOKEEPER-2505: Use shared library instead of static library in C
+  client unit test (Michael Han via phunt)
+
 
 Release 3.5.2 - 06/29/2016
 

Modified: zookeeper/branches/branch-3.5/src/c/Makefile.am
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/c/Makefile.am?rev=1757451&r1=1757450&r2=1757451&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/c/Makefile.am (original)
+++ zookeeper/branches/branch-3.5/src/c/Makefile.am Tue Aug 23 23:04:31 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)