Merge 2.5.x changes into trunk.

This commit is contained in:
b1v1r
2009-09-24 19:11:16 +00:00
parent aa1e053025
commit 21ecf99dab
13 changed files with 786 additions and 674 deletions

4
apache2/configure vendored
View File

@@ -5571,7 +5571,7 @@ $as_echo_n "checking for libapu config script... " >&6; }
for x in ${test_paths}; do
if test ! -d "$x" -a -e "$x"; then
APU_CONFIG="`basename $x`"
APU_CONFIG=$x
apu_path="no"
break
fi
@@ -5721,7 +5721,7 @@ $as_echo_n "checking for liblua config script... " >&6; }
for x in ${test_paths}; do
if test ! -d "$x" -a -e "$x"; then
LUA_CONFIG="$x"
LUA_CONFIG=$x
break
fi