Merge 2.5.x changes to trunk.

This commit is contained in:
b1v1r
2009-05-31 08:45:50 +00:00
parent 12b9bcd33a
commit e5becf8407
9 changed files with 240 additions and 98 deletions

View File

@@ -20,7 +20,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AC_PROG_GREP
AC_PATH_PROGS(PERL, [perl perl5], )
AC_PATH_PROGS(ENV_CMD, [env printenv], )
# Checks for header files.
AC_HEADER_STDC
@@ -286,7 +288,7 @@ sinclude(build/find_curl.m4)
### Build *EXTRA_CFLAGS vars
# Allow overriding EXTRA_CFLAGS
if env | grep "^EXTRA_CFLAGS" > /dev/null 2>&1; then
if $ENV_CMD | $GREP "^EXTRA_CFLAGS" > /dev/null 2>&1; then
if test -z "$debug_mem"; then
EXTRA_CFLAGS="$EXTRA_CFLAGS $strict_compile"
fi