1 --- php/sapi/apache2filter/config.m4~ 2005-09-01 16:33:47.000000000 +0200
2 +++ php/sapi/apache2filter/config.m4 2006-08-20 14:38:27.856722182 +0200
5 # Pick up ap[ru]-N-config if using httpd >=2.1
6 APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
7 - echo $APR_BINDIR/apr-config`
8 + echo $APR_BINDIR/apr-1-config`
9 APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
10 - echo $APU_BINDIR/apu-config`
11 + echo $APU_BINDIR/apu-1-config`
13 APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
14 APU_CFLAGS="`$APU_CONFIG --includes`"
15 --- php/sapi/apache2handler/config.m4~ 2006-08-20 14:25:30.607537446 +0200
16 +++ php/sapi/apache2handler/config.m4 2006-08-20 14:38:52.423756303 +0200
19 # Pick up ap[ru]-N-config if using httpd >=2.1
20 APR_CONFIG=`$APXS -q APR_CONFIG 2>/dev/null ||
21 - echo $APR_BINDIR/apr-config`
22 + echo $APR_BINDIR/apr-1-config`
23 APU_CONFIG=`$APXS -q APU_CONFIG 2>/dev/null ||
24 - echo $APU_BINDIR/apu-config`
25 + echo $APU_BINDIR/apu-1-config`
27 APR_CFLAGS="`$APR_CONFIG --cppflags --includes`"
28 APU_CFLAGS="`$APU_CONFIG --includes`"