JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/trunk/; revision=377
This commit is contained in:
Eelco Dolstra 2003-09-01 14:53:07 +00:00
parent eef0deb633
commit 15b39d40af
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/subversion/subversion-build.sh
View File

@ -14,6 +14,10 @@ fi
if test $httpServer; then if test $httpServer; then
extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags" extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags" 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 fi
if test $pythonBindings; then if test $pythonBindings; then

1
pkgs/subversion/subversion.fix
View File

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