1 --- serf-1.3.1/SConstruct.orig 2013-08-15 11:13:20.000000000 +0200
2 +++ serf-1.3.1/SConstruct 2013-08-25 09:57:51.577679354 +0200
4 unknown = opts.UnknownVariables()
6 print 'Unknown variables:', ', '.join(unknown.keys())
12 ### there is probably a better way to run/capture output.
13 ### env.ParseConfig() may be handy for getting this stuff into the build
15 - apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
16 - apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
17 + apr_libs = os.popen(env.subst('$APR --link-ld --libs')).read().strip()
18 + apu_libs = os.popen(env.subst('$APU --link-ld --libs')).read().strip()
24 '@MAJOR@': str(MAJOR),
25 '@PREFIX@': '$PREFIX',
26 + '@LIBDIR@': '$LIBDIR',
27 '@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
28 '@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
29 '@LIBS@': '%s %s %s -lz' % (apu_libs, apr_libs,
30 --- serf-1.3.1/build/serf.pc.in.orig 2011-08-06 09:52:19.000000000 +0200
31 +++ serf-1.3.1/build/serf.pc.in 2013-08-25 10:53:44.470871980 +0200
33 SERF_MAJOR_VERSION=@MAJOR@
36 -libdir=${exec_prefix}/lib
38 includedir=${prefix}/include/@INCLUDE_SUBDIR@