Kouhei Sutou
null+****@clear*****
Wed Jan 16 18:07:22 JST 2013
Kouhei Sutou 2013-01-16 18:07:22 +0900 (Wed, 16 Jan 2013) New Revision: 200ec91be9774c151923a17b224f9060cb15aa51 https://github.com/groonga/groonga/commit/200ec91be9774c151923a17b224f9060cb15aa51 Log: groonga-httpd: disable gzip module when zlib isn't found Modified files: configure.ac groonga-httpd-conf.sh.in vendor/nginx/configure Modified: configure.ac (+5 -1) =================================================================== --- configure.ac 2013-01-16 18:00:34 +0900 (dcbac24) +++ configure.ac 2013-01-16 18:07:22 +0900 (18c79bc) @@ -829,10 +829,14 @@ AC_ARG_WITH(zlib, [use zlib for data compression. [default=no]])], [with_zlib="$withval"], [with_zlib="no"]) +WITH_ZLIB=no if test "x$with_zlib" = "xyes"; then AC_DEFINE(WITH_ZLIB, [1], [with zlib]) - AC_SEARCH_LIBS(compress, z, [], [AC_MSG_ERROR("No libz found")]) + AC_SEARCH_LIBS(compress, z, [WITH_ZLIB=yes], [AC_MSG_ERROR("No libz found")]) +else + AC_SEARCH_LIBS(compress, z, [WITH_ZLIB=yes], []) fi +AC_SUBST(WITH_ZLIB) # LZO AC_ARG_WITH(lzo, Modified: groonga-httpd-conf.sh.in (+1 -0) =================================================================== --- groonga-httpd-conf.sh.in 2013-01-16 18:00:34 +0900 (e647b02) +++ groonga-httpd-conf.sh.in 2013-01-16 18:07:22 +0900 (c3eb803) @@ -21,3 +21,4 @@ export GROONGA_HTTPD_DEBUG="@grn_debug@" export GROONGA_HTTPD_WITH_PCRE="@WITH_PCRE@" export GROONGA_HTTPD_PCRE_CFLAGS="@PCRE_CFLAGS@" export GROONGA_HTTPD_PCRE_LIBS_ONLY_L="@PCRE_LIBS_ONLY_L@" +export GROONGA_HTTPD_WITH_ZLIB="@WITH_ZLIB" Modified: vendor/nginx/configure (+4 -0) =================================================================== --- vendor/nginx/configure 2013-01-16 18:00:34 +0900 (1ceabb1) +++ vendor/nginx/configure 2013-01-16 18:07:22 +0900 (9f45853) @@ -41,6 +41,10 @@ if [ "$GROONGA_HTTPD_WITH_PCRE" = "yes" ]; then else configure_args="$configure_args --without-http_rewrite_module" fi +if [ "$GROONGA_HTTPD_WITH_ZLIB" != "yes" ]; then + configure_args="$configure_args --without-http_gzip_module" +fi + cd "../nginx-${nginx_version}" -------------- next part -------------- HTML����������������������������...Download
