Kouhei Sutou
null+****@clear*****
Sat Sep 27 23:34:37 JST 2014
Kouhei Sutou 2014-09-27 23:34:37 +0900 (Sat, 27 Sep 2014) New Revision: f0e713ec6f52da6c7a291b7523a3448d9896f590 https://github.com/groonga/groonga/commit/f0e713ec6f52da6c7a291b7523a3448d9896f590 Message: Don't require Ruby for enabling mruby It is for released .tar.gz. Modified files: configure.ac vendor/mruby/Makefile.am Modified: configure.ac (+2 -1) =================================================================== --- configure.ac 2014-09-27 23:06:18 +0900 (90a99c8) +++ configure.ac 2014-09-27 23:34:37 +0900 (1acbbc5) @@ -1349,7 +1349,8 @@ fi AC_MSG_RESULT($enable_mruby) if test "$enable_mruby" = "yes"; then - if test "$ac_cv_ruby_available" != "yes"; then + if test ! -f "$srcdir/vendor/mruby/mruby-build.timestamp" -a \ + "$ac_cv_ruby_available" != "yes"; then AC_MSG_ERROR(--enable-ruby requires --with-ruby) fi AC_DEFINE(GRN_WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) Modified: vendor/mruby/Makefile.am (+19 -22) =================================================================== --- vendor/mruby/Makefile.am 2014-09-27 23:06:18 +0900 (13c4c94) +++ vendor/mruby/Makefile.am 2014-09-27 23:34:37 +0900 (41385bc) @@ -19,35 +19,21 @@ endif include sources.am -BUILT_SOURCES = +BUILT_SOURCES = \ + parse.c \ + mrblib.c \ + mrbgems_init.c \ + mruby_onig_regexp.c +libmruby_la_SOURCES += $(BUILT_SOURCES) -MRUBY_BUILD_DIR = $(abs_top_builddir)/vendor/mruby-build - -BUILT_SOURCES += parse.c -libmruby_la_SOURCES += parse.c parse.c: mruby-build.timestamp - cp $(MRUBY_BUILD_DIR)/host/src/y.tab.c $@ - -BUILT_SOURCES += mrblib.c -libmruby_la_SOURCES += mrblib.c mrblib.c: mruby-build.timestamp - cp $(MRUBY_BUILD_DIR)/host/mrblib/mrblib.c $@ - -BUILT_SOURCES += mrbgems_init.c -libmruby_la_SOURCES += mrbgems_init.c mrbgems_init.c: mruby-build.timestamp - ( \ - cat $(MRUBY_BUILD_DIR)/host/mrbgems/gem_init.c; \ - cat $(MRUBY_BUILD_DIR)/host/mrbgems/*/gem_init.c; \ - ) > $@ - -BUILT_SOURCES += mruby_onig_regexp.c -libmruby_la_SOURCES += mruby_onig_regexp.c -MRUBY_ONIG_REGEXP_DIR = $(MRUBY_BUILD_DIR)/mrbgems/mruby-onig-regexp mruby_onig_regexp.c: mruby-build.timestamp - cp $(MRUBY_ONIG_REGEXP_DIR)/src/mruby_onig_regexp.c $@ MRUBY_CONFIG = $(abs_srcdir)/build_config.rb +MRUBY_BUILD_DIR = $(abs_top_builddir)/vendor/mruby-build +MRUBY_ONIG_REGEXP_DIR = $(MRUBY_BUILD_DIR)/mrbgems/mruby-onig-regexp mruby-build.timestamp: build_config.rb rm -rf $(MRUBY_BUILD_DIR) cd $(srcdir)/../mruby-source && \ @@ -55,8 +41,19 @@ mruby-build.timestamp: build_config.rb MRUBY_BUILD_DIR=$(MRUBY_BUILD_DIR) \ MRUBY_CONFIG=$(MRUBY_CONFIG) touch $@ + cp $(MRUBY_BUILD_DIR)/host/src/y.tab.c parse.c + cp $(MRUBY_BUILD_DIR)/host/mrblib/mrblib.c ./ + ( \ + cat $(MRUBY_BUILD_DIR)/host/mrbgems/gem_init.c; \ + cat $(MRUBY_BUILD_DIR)/host/mrbgems/*/gem_init.c; \ + ) > mrbgems_init.c + cp $(MRUBY_ONIG_REGEXP_DIR)/src/mruby_onig_regexp.c ./ + +EXTRA_DIST += \ + mruby-build.timestamp CLEANFILES = *.gcno *gcda +MAINTAINERCLEANFILES = mruby-build.timestamp endif update: -------------- next part -------------- HTML����������������������������...Descargar
