Kouhei Sutou
null+****@clear*****
Mon Aug 19 15:11:40 JST 2013
Kouhei Sutou 2013-08-19 15:11:40 +0900 (Mon, 19 Aug 2013) New Revision: e2772c3db7191b356d130546b493cdff454e18c4 https://github.com/groonga/groonga/commit/e2772c3db7191b356d130546b493cdff454e18c4 Message: Use shared nginx version for built groonga-httpd path Modified files: configure.ac Modified: configure.ac (+4 -4) =================================================================== --- configure.ac 2013-08-19 11:52:27 +0900 (4aae134) +++ configure.ac 2013-08-19 15:11:40 +0900 (8203114) @@ -658,10 +658,6 @@ AC_SUBST(WINDOWS_LIBS) GROONGA="\$(abs_top_builddir)/src/groonga" AC_SUBST(GROONGA) -# groonga-httpd binary path -GROONGA_HTTPD="\$(abs_top_builddir)/vendor/nginx-1.2.1/objs/nginx" -AC_SUBST(GROONGA_HTTPD) - # groonga-benchmark binary path GROONGA_BENCHMARK="\$(abs_top_builddir)/src/groonga-benchmark" AC_SUBST(GROONGA_BENCHMARK) @@ -1250,6 +1246,10 @@ m4_define([nginx_version], m4_include(nginx_version)) NGINX_VERSION=nginx_version AC_SUBST(NGINX_VERSION) +# groonga-httpd binary path +GROONGA_HTTPD="\$(abs_top_builddir)/vendor/nginx-${NGINX_VERSION}/objs/nginx" +AC_SUBST(GROONGA_HTTPD) + AC_ARG_ENABLE(groonga_httpd, [AS_HELP_STRING([--enable-groonga-httpd], [enable nginx used for groonga-httpd. [default=yes]])], -------------- next part -------------- HTML����������������������������...下載
