--- apache1-mod_rpaf-0.6/gen_tests.sh	2007-12-13 05:40:22.000000000 +0200
+++ apache1-mod_rpaf-0.6-tests/gen_tests.sh	2011-12-22 17:22:21.742653887 +0200
@@ -1,23 +1,21 @@
 #!/bin/sh
 PATH=$PATH:/home/thomas/build/apache-dev/bin
 DIRECTORY=`pwd`/t
-HTTPD=`which httpd`
-HTTPD2=`which apache2`
+HTTPD=`which /usr/sbin/apache 2>/dev/null`
+APACHE2=`which /usr/sbin/httpd 2>/dev/null`
 
-cat test-Makefile-template | sed -s "s|\@\@HTTPD\@\@|$HTTPD|" | sed -s "s|\@\@HTTPD2\@\@|$HTTPD2|" > t/Makefile
+cat test-Makefile-template | sed -s "s|\@\@HTTPD\@\@|$HTTPD|" | sed -s "s|\@\@HTTPD2\@\@|$APACHE2|" > t/Makefile
 
 
-if [ "$HTTPD" != "" ]; then
+if [ -x "$HTTPD" ]; then
   echo "Found httpd as $HTTPD"
   echo "Creating test configuration for apache 1.3.x"
   echo "in directory $DIRECTORY"
   cat httpd-rpaf.conf-template | sed -s "s|\@\@DIR\@\@|$DIRECTORY|" > t/httpd-rpaf.conf
 fi
 
-APACHE2=`which apache2`
-
-if [ "$APACHE2" != "" ]; then
-  echo "Found apache2 as $HTTPD"
+if [ -x "$APACHE2" ]; then
+  echo "Found apache2 as $APACHE2"
   echo "Creating test configuration for apache 2.x.x"
   echo "in directory $DIRECTORY"
   cat httpd-rpaf.conf-template-2.0 | sed -s "s|\@\@DIR\@\@|$DIRECTORY|" > t/httpd-rpaf.conf-2.0
--- apache1-mod_rpaf-0.6/httpd-rpaf.conf-template	2008-01-01 05:03:15.000000000 +0200
+++ apache1-mod_rpaf-0.6-tests/httpd-rpaf.conf-template	2011-12-22 17:36:42.348061324 +0200
@@ -1,10 +1,18 @@
 ServerType standalone
 PidFile httpd.pid
-Port 2500
-ServerName 127.0.0.1
+
+#Port 2500
+ServerName 127.0.0.1
+Listen 127.0.0.1 2500
+
 #ServerRoot @@DIR@@
 DocumentRoot @@DIR@@/htdocs/
 ErrorLog rpaf-error_log
+LoadModule alias_module ../modules/mod_alias.so
+LoadModule cgi_module ../modules/mod_cgi.so
+LoadModule mime_module ../modules/mod_mime.so
+LoadModule rewrite_module ../modules/mod_rewrite.so
+LoadModule log_config_module ../modules/mod_log_config.so
 LoadModule rpaf_module ../mod_rpaf.so
 ScriptAlias /cgi-bin @@DIR@@/htdocs/cgi-bin
 TypesConfig /dev/null