subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1674626 - /subversion/trunk/build/generator/gen_win_dependencies.py
Date Sun, 19 Apr 2015 14:31:48 GMT
Author: rhuijben
Date: Sun Apr 19 14:31:48 2015
New Revision: 1674626

URL: http://svn.apache.org/r1674626
Log:
On Windows: enable detecting memcache support from apr-util 1.3 or later.

* build/generator/gen_win_dependencies.py
  (find_libraries): Update caller.
  (_find_apr_util_and_expat): Rename to...
  (_find_apr_util_etc): ... this. Declare availability of memcache support
    when we have apr-util 1.3 or later.

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

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1674626&r1=1674625&r2=1674626&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sun Apr 19 14:31:48 2015
@@ -296,7 +296,7 @@ class GenDependenciesBase(gen_base.Gener
 
     # Required dependencies
     self._find_apr()
-    self._find_apr_util_and_expat()
+    self._find_apr_util_etc()
     self._find_zlib()
     self._find_sqlite(show_warnings)
 
@@ -424,7 +424,7 @@ class GenDependenciesBase(gen_base.Gener
                                               defines=defines,
                                               extra_bin=extra_bin)
 
-  def _find_apr_util_and_expat(self):
+  def _find_apr_util_etc(self):
     "Find the APR-util library and version"
 
     minimal_aprutil_version = (1, 3, 0)
@@ -526,6 +526,13 @@ class GenDependenciesBase(gen_base.Gener
                                                    defines=defines,
                                                    extra_bin=extra_bin)
 
+    # Perhaps apr-util can also provide memcached support
+    if version >= (1, 3, 0) :
+      self._libraries['apr_memcache'] = SVNCommonLibrary(
+                                          'apr_memcache', inc_path, lib_dir,
+                                          lib_name, aprutil_version,
+                                          defines=['SVN_HAVE_MEMCACHE'])
+
     # And now find expat
     # If we have apr-util as a source location, it is in a subdir.
     # If we have an install package it is in the lib subdir



Mime
View raw message