You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/13 18:14:46 UTC
svn commit: r1577252 - /subversion/trunk/build/generator/gen_make.py
Author: rhuijben
Date: Thu Mar 13 17:14:46 2014
New Revision: 1577252
URL: http://svn.apache.org/r1577252
Log:
* build/generator/gen_make.py
(write_pkg_config_dot_in_files): Following up on r1577226, try to fix the
build on the unix buildbots.
Modified:
subversion/trunk/build/generator/gen_make.py
Modified: subversion/trunk/build/generator/gen_make.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1577252&r1=1577251&r2=1577252&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Thu Mar 13 17:14:46 2014
@@ -615,6 +615,9 @@ DIR=`pwd`
if lib_dep == 'apriconv':
# apriconv is part of apr-util, skip it
continue
+ if lib_dep == 'intl' and not self.enable_nls:
+ # If NLS is not enabled, don't link this
+ continue
external_lib = self.sections[lib_dep].options.get('external-lib')
if external_lib:
### Some of Subversion's internal libraries can appear as external