Revert "change the location of apr and apr-util to follow 316b8a5858." because...

Revert "change the location of apr and apr-util to follow 316b8a5858." because now they are again installed under parts/apache.

This reverts commit 56d3db33.

component/serf/buildout.cfg

@@ -12,8 +12,8 @@ recipe = hexagonit.recipe.cmmi
 url = http://serf.googlecode.com/files/serf-0.7.0.tar.gz
 md5sum = 3233f22a5875320da7bdc854d0873080
 configure-options =
-  --with-apr=${apr:location}/bin/apr-1-config
-  --with-apr-util=${apr-util:location}/bin/apu-1-config
+  --with-apr=${apache:location}/bin/apr-1-config
+  --with-apr-util=${apache:location}/bin/apu-1-config
   --with-openssl=${openssl:location}
 environment =
   CFLAGS=-I${zlib:location}/include -I${libuuid:location}/include

component/subversion/buildout.cfg

@@ -30,8 +30,8 @@ patches =
   ${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
 configure-options =
   --disable-static
-  --with-apr=${apr:location}/bin/apr-1-config
-  --with-apr-util=${apr-util:location}/bin/apu-1-config
+  --with-apr=${apache:location}/bin/apr-1-config
+  --with-apr-util=${apache:location}/bin/apu-1-config
   --without-apxs
   --with-zlib=${zlib:location}
   --with-sqlite=${sqlite3:location}