--- /dev/null
+--- php/sapi/apache2filter/config.m4~ 2005-09-01 16:33:47.000000000 +0200
++++ php/sapi/apache2filter/config.m4 2006-08-20 14:38:27.856722182 +0200
+@@ -42,9 +42,9 @@
+
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+- echo $APR_BINDIR/apr-config`
++ echo $APR_BINDIR/apr-1-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+- echo $APU_BINDIR/apu-config`
++ echo $APU_BINDIR/apu-1-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"
+--- php/sapi/apache2handler/config.m4~ 2006-08-20 14:25:30.607537446 +0200
++++ php/sapi/apache2handler/config.m4 2006-08-20 14:38:52.423756303 +0200
+@@ -41,9 +41,9 @@
+
+ # Pick up ap[ru]-N-config if using httpd >=2.1
+ APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
+- echo $APR_BINDIR/apr-config`
++ echo $APR_BINDIR/apr-1-config`
+ APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
+- echo $APU_BINDIR/apu-config`
++ echo $APU_BINDIR/apu-1-config`
+
+ APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
+ APU_CFLAGS="`$APU_CONFIG --includes`"