trunk-tracking: merge in master

This commit is contained in:
Jeff Kaufman
2014-04-17 10:49:58 -04:00
2 changed files with 9 additions and 5 deletions
+4
View File
@@ -109,6 +109,10 @@ case "$NGX_GCC_VER" in
;;
esac
if [ "$WNO_ERROR" = "YES" ]; then
CFLAGS="$CFLAGS -Wno-error"
fi
pagespeed_include="\
$mod_pagespeed_dir \
$mod_pagespeed_dir/third_party/chromium/src \