svn commit: r1504208 - in /subversion/trunk: build.conf build/generator/gen_win_dependencies.py

[rh...@apache.org]

Author: rhuijben
Date: Wed Jul 17 17:28:12 2013
New Revision: 1504208

URL: http://svn.apache.org/r1504208
Log:
Promote openssl to a proper dependency library, instead of only passing the
information to serf. This makes linking against serf 1.3 and later possible.

* build.conf
  Add openssl as dependency project.
  Use msvc-libs trick to trick us into linking against multiple libraries.
  
* build/generator/gen_win_dependencies.py
  Check for 'openssl' instead of the pre r1504194 ssleay32 name.

Modified:
    subversion/trunk/build.conf
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build.conf
URL: http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1504208&r1=1504207&r2=1504208&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Wed Jul 17 17:28:12 2013
@@ -1215,6 +1215,11 @@ external-lib = $(SVN_MAGIC_LIBS)
 type = lib
 external-lib = $(SVN_SASL_LIBS)
 
+[openssl]
+type = lib
+external-lib = $(SVN_OPENSSL_LIBS)
+msvc-libs = ssleay32.lib libeay32.lib
+
 [zlib]
 type = lib
 external-lib = $(SVN_ZLIB_LIBS)
@@ -1229,7 +1234,7 @@ external-lib = $(SVN_APR_MEMCACHE_LIBS)
 type = lib
 external-lib = $(SVN_SERF_LIBS)
 external-project = serf/serf
-libs = apr aprutil xml
+libs = apr aprutil xml openssl
 msvc-static = yes
 
 [sqlite]

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1504208&r1=1504207&r2=1504208&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Jul 17 17:28:12 2013
@@ -947,7 +947,7 @@ class GenDependenciesBase(gen_base.Gener
         print("Use '--with-serf' to configure serf location.");
       return
     
-    if is_src and 'ssleay32' not in self._libraries:
+    if is_src and 'openssl' not in self._libraries:
       if show_warning:
         print('openssl not found, serf and ra_serf will not be built')
       return