Author: rhuijben
Date: Mon Nov 2 22:25:32 2015
New Revision: 1712172
URL: http://svn.apache.org/viewvc?rev=1712172&view=rev
Log:
* SConstruct
When applying the apache and apr configuration merge the
configuration instead of replacing specific elements.
Patch from issue SERF-160.
Modified:
serf/trunk/SConstruct
Modified: serf/trunk/SConstruct
URL:
http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1712172&r1=1712171&r2=1712172&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Mon Nov 2 22:25:32 2015
@@ -384,9 +384,10 @@ else:
### dependency upon gcc. probably ParseConfig doesn't know what to do with
### the apr-1-config output
env.ParseConfig('$APR --cflags --cppflags --ldflags --includes'
- ' --link-ld --libs')
+ ' --link-ld --libs', unique=0)
if apr_major < 2:
- env.ParseConfig('$APU --ldflags --includes --link-ld --libs')
+ env.ParseConfig('$APU --ldflags --includes --link-ld --libs',
+ unique=0)
### there is probably a better way to run/capture output.
### env.ParseConfig() may be handy for getting this stuff into the build
