back to --with-included-apr build because pysvn assumes both apr and apr-util...

back to --with-included-apr build because pysvn assumes both apr and apr-util header files in a single directory.

component/apache/buildout.cfg

@@ -14,36 +14,16 @@ extends =
   ../zlib/buildout.cfg
 
 [apr]
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-1.4.6.tar.bz2
+recipe = hexagonit.recipe.download
+version = 1.4.6
+url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
 md5sum = ffee70a111fd07372982b0550bbb14b7
-configure-options = --disable-static
-environment =
-  CPPFLAGS=-I${libuuid:location}/include
-  LDFLAGS=-L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib
 
 [apr-util]
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-1.4.1.tar.bz2
+recipe = hexagonit.recipe.download
+version = 1.4.1
+url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-util-${:version}.tar.bz2
 md5sum = 52b31b33fb1aa16e65ddaefc76e41151
-configure-options =
-  --disable-static
-  --with-apr=${apr:location}
-  --with-openssl=${openssl:location}
-  --with-expat=${libexpat:location}
-  --with-sqlite3=${sqlite3:location}
-  --with-gdbm=${gdbm:location}
-  --without-lber
-  --without-ldap
-  --without-ndbm
-  --without-berkeley-db
-  --without-pgsql
-  --without-mysql
-  --without-sqlite2
-  --without-oracle
-  --without-freetds
-  --without-odbc
-  --without-iconv
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
@@ -51,9 +31,12 @@ recipe = hexagonit.recipe.cmmi
 depends =
   ${gdbm:version}
 version = 2.4.1
+revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 7d3001c7a26b985d17caa367a868f11c
-configure-options = --disable-static
+configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
+configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+                    --disable-static
                     --enable-authn-alias
                     --enable-bucketeer
                     --enable-cache
@@ -81,8 +64,7 @@ configure-options = --disable-static
                     --enable-so
                     --enable-ssl
                     --disable-lua
-                    --with-apr=${apr:location}
-                    --with-apr-util=${apr-util:location}
+                    --with-included-apr
                     --with-ssl=${openssl:location}
                     --with-z=${zlib:location}
                     --with-expat=${libexpat:location}
@@ -125,6 +107,7 @@ patches =
   ${mod_antiloris-apache-2.4.patch:location}/${mod_antiloris-apache-2.4.patch:filename}
 depends =
   ${apache:version}
+  ${apache:revision}
 configure-command = ${apache:location}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}