Merge in changes from 2.5.x.

This commit is contained in:
b1v1r 2009-12-14 19:20:48 +00:00
parent ea4b75d8b1
commit c341899b4b
2 changed files with 2 additions and 2 deletions

2
apache2/configure vendored
View File

@ -4468,7 +4468,7 @@ $as_echo "$as_me: apxs LDFLAGS: $APXS_LDFLAGS" >&6;}; fi
$as_echo "$as_me: apxs LIBDIR: $APXS_LIBDIR" >&6;}; fi
# Make sure the lib dir is used
if test -n "$APXS_LIBDIR"; then
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
APXS_LIBS="-L${APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
else
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
fi

View File

@ -271,7 +271,7 @@ VERSION_OK
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(apxs LIBDIR: $APXS_LIBDIR); fi
# Make sure the lib dir is used
if test -n "$APXS_LIBDIR"; then
APXS_LIBS="-L{$APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
APXS_LIBS="-L${APXS_LIBDIR} `$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
else
APXS_LIBS="`$APXS -q LIBS` `$APXS -q EXTRA_LIBS`"
fi