Author: jcorvel
Date: Sat Aug 24 20:02:29 2013
New Revision: 1517192
URL: http://svn.apache.org/r1517192
Log:
On Windows, make it possible to build Subversion against Serf 1.3.0 and
higher by allowing compilation against an already compiled serf.
* build/generator/gen_win_dependencies.py
(_find_serf): Set is_src to False when version >= 1.3.0.
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=1517192&r1=1517191&r2=1517192&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Sat Aug 24
20:02:29 2013
@@ -1033,10 +1033,12 @@ class GenDependenciesBase(gen_base.Gener
if version < (1, 3, 0):
lib_dir = os.path.join(self.serf_path, 'Release')
debug_lib_dir = os.path.join(self.serf_path, 'Debug')
+ is_src = True
else:
lib_dir = self.serf_path
debug_lib_dir = None
- is_src = True
+ inc_dir = self.serf_path
+ is_src = False
elif os.path.isfile(os.path.join(self.serf_path, 'include/serf-1/serf.h')):
# Install layout
inc_dir = os.path.join(self.serf_path, 'include/serf-1')
