* Link in expat if we are *not* building an Apache module.

svn path=/nixpkgs/trunk/; revision=377

pkgs/subversion/subversion-build.sh

@@ -14,6 +14,10 @@ fi
 if test $httpServer; then
     extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
     extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+else
+    NIX_CFLAGS_COMPILE="-I$expat/include $NIX_CFLAGS_COMPILE"
+    NIX_CFLAGS_LINK="-L$expat/lib $NIX_CFLAGS_LINK"
+    NIX_LDFLAGS="-rpath $expat/lib $NIX_LDFLAGS"
 fi
 
 if test $pythonBindings; then

pkgs/subversion/subversion.fix

@@ -22,6 +22,7 @@ Function(["localServer", "httpsClient", "httpServer", "pythonBindings"],
     , ("httpd", If(Var("httpServer"), IncludeFix("httpd/httpd.fix"), ""))
     , ("db4", If(Var("localServer"), IncludeFix("db4/db4.fix"), ""))
     , ("libxml", IncludeFix("libxml2/libxml2.fix"))
+    , ("expat", If(Var("httpServer"), "", IncludeFix("expat/expat.fix")))
     ]
   )
 )