Kentaro Hayashi
null+****@clear*****
Wed Oct 12 10:54:31 JST 2016
Kentaro Hayashi 2016-10-12 10:54:31 +0900 (Wed, 12 Oct 2016) New Revision: 1cba35ceed026bbf49a1458c001008233f0e9fcf https://github.com/groonga/groonga/commit/1cba35ceed026bbf49a1458c001008233f0e9fcf Message: groonga-httpd: enable mruby when --enable-mruby is specified When mruby is enabled for groonga-httpd, mruby is built as a loadable module (/etc/groonga/httpd/modulesngx_http_mruby_module.so) Modified files: configure.ac groonga-httpd-conf.sh.in src/httpd/configure Modified: configure.ac (+2 -0) =================================================================== --- configure.ac 2016-10-12 10:31:15 +0900 (13edbbf) +++ configure.ac 2016-10-12 10:54:31 +0900 (0e88b97) @@ -1558,9 +1558,11 @@ if test "$enable_mruby" = "yes"; then fi AC_DEFINE(GRN_WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) MRUBY_CFLAGS="-I\$(top_srcdir)/vendor/mruby-source/include" + GRN_WITH_MRUBY="yes" else MRUBY_CFLAGS="" fi +AC_SUBST(GRN_WITH_MRUBY) AC_SUBST(MRUBY_CFLAGS) AM_CONDITIONAL(WITH_MRUBY, test "$enable_mruby" = "yes") Modified: groonga-httpd-conf.sh.in (+1 -0) =================================================================== --- groonga-httpd-conf.sh.in 2016-10-12 10:31:15 +0900 (b195b28) +++ groonga-httpd-conf.sh.in 2016-10-12 10:54:31 +0900 (4dbb400) @@ -31,3 +31,4 @@ export GROONGA_HTTPD_WITH_ZLIB="@GRN_WITH_ZLIB@" export GROONGA_HTTPD_WITH_SSL="@GRN_WITH_SSL@" export GROONGA_HTTPD_SSL_CFLAGS="@SSL_CFLAGS@" export GROONGA_HTTPD_SSL_LIBS_ONLY_L="@SSL_LIBS_ONLY_L@" +export GROONGA_HTTPD_WITH_MRUBY="@GRN_WITH_MRUBY@" Modified: src/httpd/configure (+9 -0) =================================================================== --- src/httpd/configure 2016-10-12 10:31:15 +0900 (87c28d5) +++ src/httpd/configure 2016-10-12 10:54:31 +0900 (196d3b2) @@ -86,6 +86,15 @@ if [ "${GROONGA_HTTPD_WITH_SSL}" = "yes" ]; then configure_args="${configure_args} --with-http_ssl_module" fi +nginx_mruby_directory="${top_builddir}/vendor/ngx_mruby-source" +mruby_directory="${top_srcdir}/vendor/mruby-source" +if [ "${GROONGA_HTTPD_WITH_MRUBY}" = "yes" ]; then + cd "${nginx_mruby_directory}" + ./configure --with-ngx-src-root=${nginx_directory} --with-mruby-root=${mruby_directory} + make build_mruby_with_fpic + make generate_gems_config_dynamic + configure_args="${configure_args} --add-dynamic-module=${nginx_mruby_directory}" +fi cd "${nginx_directory_in_build_directory}" -------------- next part -------------- HTML����������������������������...Download