svn commit: r1520891 - /subversion/trunk/build.conf

[rh...@apache.org]

Author: rhuijben
Date: Sun Sep  8 18:26:10 2013
New Revision: 1520891

URL: http://svn.apache.org/r1520891
Log:
Tweak some serf and gmock dependencies to allow building a few more optional
projects on Windows without compilation errors.

* trunk/build.conf
  (libsvn_ra_serf): Remove secur32.lib that belongs on serf.
  (libgmock): Don't handle as shared library.
  (serf): Add zlib and secur32.lib as dependencies.
  (__MORE__): Add svnauth.

Modified:
    subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1520891&r1=1520890&r2=1520891&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Sun Sep  8 18:26:10 2013
@@ -318,7 +318,6 @@ type = ra-module
 path = subversion/libsvn_ra_serf
 install = serf-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr serf xml zlib
-msvc-libs = secur32.lib
 msvc-static = yes
 
 # Accessing repositories via SVN
@@ -733,6 +732,7 @@ type = lib
 path = gmock-fused
 sources = gmock-gtest-all.cc
 install = tests
+msvc-static = yes
 compile-cmd = $(COMPILE_GMOCK_CXX)
 link-cmd = $(LINK_CXX_LIB)
 
@@ -1317,7 +1317,8 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS)
 type = lib
 external-lib = $(SVN_SERF_LIBS)
 external-project = serf/serf
-libs = apr aprutil xml openssl
+libs = apr aprutil openssl xml zlib
+msvc-libs = secur32.lib
 msvc-static = yes
 
 [sqlite]
@@ -1396,7 +1397,7 @@ libs = __ALL__
 type = project
 path = build/win32
 libs = __ALL_TESTS__
-       diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svn-bench
+       diff diff3 diff4 fsfs-reorg fsfs-stats fsfs-access-map svnauth svn-bench
        svn-rep-sharing-stats svn-populate-node-origins-index
 
 [__LIBS__]