Navigation Menu

Skip to content

Commit

Permalink
groonga-httpd: don't use CFLAGS
Browse files Browse the repository at this point in the history
Because nginx's auto CC configuration is skipped when CFLAGS is set.
  • Loading branch information
kou committed Aug 9, 2012
1 parent 7aa0c97 commit 8e426b4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions vendor/nginx/configure
Expand Up @@ -33,14 +33,17 @@ if [ "$GROONGA_HTTPD_DEBUG" = "yes" ]; then
configure_args="$configure_args --with-debug"
fi

NGX_CC_OPT="$CFLAGS"
unset CFLAGS

if [ "$GROONGA_HTTPD_WITH_PCRE" = "yes" ]; then
CFLAGS="$CFLAGS $GROONGA_HTTPD_PCRE_CFLAGS"
NGX_CC_OPT="$NGX_CC_OPT $GROONGA_HTTPD_PCRE_CFLAGS"
LIBS="$LIBS $GROONGA_HTTPD_PCRE_LIBS_ONLY_L"
else
configure_args="$configure_args --without-http_rewrite_module"
fi

export CFLAGS
export NGX_CC_OPT
export LIBS

cd "../nginx-${nginx_version}"
Expand Down

0 comments on commit 8e426b4

Please sign in to comment.