Kouhei Sutou
null+****@clear*****
Sun Sep 28 00:01:46 JST 2014
Kouhei Sutou 2014-09-28 00:01:46 +0900 (Sun, 28 Sep 2014) New Revision: 859c7f40f390bdcdb8ced53292977ba159d25010 https://github.com/groonga/groonga/commit/859c7f40f390bdcdb8ced53292977ba159d25010 Message: Install libonigmo.so on --enable-shared-onigmo build Modified files: configure.ac vendor/onigmo/Makefile.am Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2014-09-27 23:57:36 +0900 (1acbbc5) +++ configure.ac 2014-09-28 00:01:46 +0900 (a09f401) @@ -1372,7 +1372,7 @@ AC_ARG_ENABLE(shared-onigmo, [use Onigmo as shared library instead of static library. [default=no]])], [enable_shared_onigmo="$enableval"], [enable_shared_onigmo="no"]) - +AM_CONDITIONAL(WITH_SHARED_ONIGMO, test "$enable_shared_onigmo" = "yes") # PCRE GRN_WITH_PCRE=no Modified: vendor/onigmo/Makefile.am (+9 -0) =================================================================== --- vendor/onigmo/Makefile.am 2014-09-27 23:57:36 +0900 (40ccc1d) +++ vendor/onigmo/Makefile.am 2014-09-28 00:01:46 +0900 (772bfb4) @@ -5,9 +5,13 @@ CONFIGURE_DEPENDENCIES = \ configure ALL_DEPEND_TARGETS = +INSTALL_DEPEND_TARGETS = CLEAN_DEPEND_TARGETS = if WITH_MRUBY ALL_DEPEND_TARGETS += onigmo-all +if WITH_SHARED_ONIGMO +INSTALL_DEPEND_TARGETS += onigmo-install +endif CLEAN_DEPEND_TARGETS += onigmo-clean endif @@ -16,6 +20,11 @@ onigmo-all: all: $(ALL_DEPEND_TARGETS) +onigmo-install: + cd ../onigmo-source && $(MAKE) install + +install: $(INSTALL_DEPEND_TARGETS) + onigmo-clean: cd ../onigmo-source && $(MAKE) clean -------------- next part -------------- HTML����������������������������...Download