- updated to 1.3.1 (note: new soname; build system changed to scons)

[packages/serf.git] / serf-scons.patch

--- serf-1.3.1/SConstruct.orig	2013-08-15 11:13:20.000000000 +0200
+++ serf-1.3.1/SConstruct	2013-08-25 09:57:51.577679354 +0200
@@ -178,7 +178,6 @@
 unknown = opts.UnknownVariables()
 if unknown:
   print 'Unknown variables:', ', '.join(unknown.keys())
-  Exit(1)
 
 apr = str(env['APR'])
 apu = str(env['APU'])
@@ -341,8 +341,8 @@
   ### there is probably a better way to run/capture output.
   ### env.ParseConfig() may be handy for getting this stuff into the build
   if CALLOUT_OKAY:
-    apr_libs = os.popen(env.subst('$APR --link-libtool --libs')).read().strip()
-    apu_libs = os.popen(env.subst('$APU --link-libtool --libs')).read().strip()
+    apr_libs = os.popen(env.subst('$APR --link-ld --libs')).read().strip()
+    apu_libs = os.popen(env.subst('$APU --link-ld --libs')).read().strip()
   else:
     apr_libs = ''
     apu_libs = ''
@@ -374,6 +374,7 @@
                          SUBST_DICT = {
                            '@MAJOR@': str(MAJOR),
                            '@PREFIX@': '$PREFIX',
+                           '@LIBDIR@': '$LIBDIR',
                            '@INCLUDE_SUBDIR@': 'serf-%d' % (MAJOR,),
                            '@VERSION@': '%d.%d.%d' % (MAJOR, MINOR, PATCH),
                            '@LIBS@': '%s %s %s -lz' % (apu_libs, apr_libs,
--- serf-1.3.1/build/serf.pc.in.orig	2011-08-06 09:52:19.000000000 +0200
+++ serf-1.3.1/build/serf.pc.in	2013-08-25 10:53:44.470871980 +0200
@@ -1,7 +1,7 @@
 SERF_MAJOR_VERSION=@MAJOR@
 prefix=@PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@LIBDIR@
 includedir=${prefix}/include/@INCLUDE_SUBDIR@
 
 Name: serf