null+****@clear*****
null+****@clear*****
2012年 8月 6日 (月) 22:44:51 JST
Kouhei Sutou 2012-08-06 22:44:51 +0900 (Mon, 06 Aug 2012) New Revision: 0398dac6d70aa17ac47c1579ba060f7412af5433 https://github.com/groonga/groonga/commit/0398dac6d70aa17ac47c1579ba060f7412af5433 Log: --enable-nginx -> --enable-groonga-httpd Modified files: configure.ac vendor/Makefile.am Modified: configure.ac (+11 -11) =================================================================== --- configure.ac 2012-08-06 22:42:57 +0900 (337cdd1) +++ configure.ac 2012-08-06 22:44:51 +0900 (5899b5d) @@ -1197,19 +1197,19 @@ AC_ARG_WITH(groonga-github-com-path, [GROONGA_GITHUB_COM_PATH=""]) AC_SUBST(GROONGA_GITHUB_COM_PATH) -# nginx -AC_ARG_ENABLE(nginx, - [AS_HELP_STRING([--enable-nginx], +# groonga-httpd +AC_ARG_ENABLE(groonga_httpd, + [AS_HELP_STRING([--enable-groonga-httpd], [enable nginx used for groonga-httpd. [default=yes]])], - [enable_nginx="$enableval"], - [enable_nginx="yes"]) -if test "x$enable_nginx" != "xno"; then - enable_nginx="yes" + [enable_groonga_httpd="$enableval"], + [enable_groonga_httpd="yes"]) +if test "x$enable_groonga_httpd" != "xno"; then + enable_groonga_httpd="yes" AC_CONFIG_SUBDIRS([vendor/nginx]) else - enable_nginx="no" + enable_groonga_httpd="no" fi -AM_CONDITIONAL(WITH_NGINX, test "$enable_nginx" = "yes") +AM_CONDITIONAL(WITH_GROONGA_HTTPD, test "$enable_groonga_httpd" = "yes") # PCRE WITH_PCRE=no @@ -1327,8 +1327,8 @@ fi echo echo "groonga-httpd:" -echo " enable: $enable_nginx" -if test "$enable_nginx" = "yes"; then +echo " enable: $enable_groonga_httpd" +if test "$enable_groonga_httpd" = "yes"; then echo " default database path: $GROONGA_HTTPD_DEFAULT_DATABASE_PATH" echo " PCRE: $WITH_PCRE" if test "$WITH_PCRE" = "yes"; then Modified: vendor/Makefile.am (+1 -1) =================================================================== --- vendor/Makefile.am 2012-08-06 22:42:57 +0900 (34cd120) +++ vendor/Makefile.am 2012-08-06 22:44:51 +0900 (d569ce1) @@ -2,7 +2,7 @@ # This isn't compatible with the 'all' default rule generated by Automake # So, override the all rule. -if WITH_NGINX +if WITH_GROONGA_HTTPD NGINX_DIR = nginx-1.2.1 NGINX_MAKEILE = $(NGINX_DIR)/Makefile -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...下載
