null+****@clear*****
null+****@clear*****
2012年 6月 27日 (水) 16:13:42 JST
HAYASHI Kentaro 2012-06-27 16:13:42 +0900 (Wed, 27 Jun 2012) New Revision: d1d9129269a515fbca1503246639b0b7e3c55d5f https://github.com/groonga/groonga/commit/d1d9129269a515fbca1503246639b0b7e3c55d5f Log: windows: disable to build groonga-httpd TODO: support groonga-httpd by building Visual Studio in the next release. Modified files: configure.ac vendor/Makefile.am Modified: configure.ac (+3 -1) =================================================================== --- configure.ac 2012-06-27 15:38:19 +0900 (ca8ea25) +++ configure.ac 2012-06-27 16:13:42 +0900 (c50669f) @@ -1161,10 +1161,11 @@ AC_ARG_ENABLE(nginx, [AS_HELP_STRING([--enable-nginx], [enable nginx used for groonga-httpd. [default=yes]])], [enable_nginx="$enableval"], - [enable_nginx="auto"]) + [enable_nginx="yes"]) if test "x$enable_nginx" != "xno"; then AC_CONFIG_SUBDIRS([vendor/nginx]) fi +AM_CONDITIONAL(WITH_NGINX, test "$enable_nginx" = "yes") # For package AC_ARG_WITH(rsync-path, @@ -1219,6 +1220,7 @@ echo " buildable: ${document_buildable}" echo " built: ${have_built_document}" echo " Munin plugins: ${install_munin_plugins}" echo " Package platform: ${package_platform}" +echo " groonga-httpd: ${enable_nginx}" echo echo "Paths:" echo " Install path prefix: ${prefix}" Modified: vendor/Makefile.am (+2 -0) =================================================================== --- vendor/Makefile.am 2012-06-27 15:38:19 +0900 (ba20358) +++ vendor/Makefile.am 2012-06-27 16:13:42 +0900 (d327e00) @@ -2,10 +2,12 @@ # This isn't compatible with the 'all' default rule generated by Automake # So, override the all rule. +if WITH_NGINX all-local: (cd nginx-1.2.1 && $(MAKE) build) install-exec-local: (cd nginx-1.2.1 && $(MAKE) install) +endif EXTRA_DIST = nginx nginx-1.2.1 -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下載
