Kouhei Sutou
null+****@clear*****
Tue Aug 14 14:14:23 JST 2012
Kouhei Sutou 2012-08-14 14:14:23 +0900 (Tue, 14 Aug 2012) New Revision: 7c4b3a4749f823c56b70682385419ab480871a73 https://github.com/groonga/groonga/commit/7c4b3a4749f823c56b70682385419ab480871a73 Log: groonga-httpd: use --with-cc-opt and --with-ld-opt Modified files: vendor/nginx/configure Modified: vendor/nginx/configure (+6 -8) =================================================================== --- vendor/nginx/configure 2012-08-14 13:57:33 +0900 (3b32e54) +++ vendor/nginx/configure 2012-08-14 14:14:23 +0900 (aeea65b) @@ -33,19 +33,15 @@ if [ "$GROONGA_HTTPD_DEBUG" = "yes" ]; then configure_args="$configure_args --with-debug" fi -NGX_CC_OPT="$CFLAGS" -unset CFLAGS - +cc_opt="" +ld_opt="" if [ "$GROONGA_HTTPD_WITH_PCRE" = "yes" ]; then - NGX_CC_OPT="$NGX_CC_OPT $GROONGA_HTTPD_PCRE_CFLAGS" - LIBS="$LIBS $GROONGA_HTTPD_PCRE_LIBS_ONLY_L" + cc_opt="$cc_opt $GROONGA_HTTPD_PCRE_CFLAGS" + ld_opt="$ld_opt $GROONGA_HTTPD_PCRE_LIBS_ONLY_L" else configure_args="$configure_args --without-http_rewrite_module" fi -export NGX_CC_OPT -export LIBS - cd "../nginx-${nginx_version}" ./configure \ @@ -55,6 +51,8 @@ cd "../nginx-${nginx_version}" --error-log-path="${GROONGA_HTTPD_ERROR_LOG_PATH}" \ --http-log-path="${GROONGA_HTTPD_HTTP_LOG_PATH}" \ --add-module="${GROONGA_HTTPD_MODULE_PATH}" \ + --with-cc-opt="${cc_opt}" \ + --with-ld-opt="${ld_opt}" \ ${configure_args} if [ "$GROONGA_HTTPD_DEBUG" = "yes" ]; then -------------- next part -------------- HTML����������������������������...Download
