Kouhei Sutou
null+****@clear*****
Fri Sep 26 22:51:18 JST 2014
Kouhei Sutou 2014-09-26 22:51:18 +0900 (Fri, 26 Sep 2014) New Revision: 2c6abcaebc11c6c2aa684be1db6602b6c2be9a48 https://github.com/groonga/groonga/commit/2c6abcaebc11c6c2aa684be1db6602b6c2be9a48 Message: package windows: use Onigmo as shared library Because we can't link static library Onigmo on Windows. :< Modified files: configure.ac packages/windows/Rakefile vendor/onigmo/configure Modified: configure.ac (+8 -0) =================================================================== --- configure.ac 2014-09-26 22:50:52 +0900 (13839c6) +++ configure.ac 2014-09-26 22:51:18 +0900 (721c5b0) @@ -1364,6 +1364,14 @@ AC_SUBST(MRUBY_CFLAGS) AC_SUBST(MRUBY_LIBS) AM_CONDITIONAL(WITH_MRUBY, test "$enable_mruby" = "yes") +# This option is used in vendor/onigmo/configure +AC_ARG_ENABLE(shared-onigmo, + [AS_HELP_STRING([--enable-shared-onigmo], + [use Onigmo as shared library instead of static library. [default=no]])], + [enable_shared_onigmo="$enableval"], + [enable_shared_onigmo="no"]) + + # PCRE GRN_WITH_PCRE=no AC_ARG_WITH(pcre, Modified: packages/windows/Rakefile (+1 -0) =================================================================== --- packages/windows/Rakefile 2014-09-26 22:50:52 +0900 (5f96bf2) +++ packages/windows/Rakefile 2014-09-26 22:51:18 +0900 (4e97703) @@ -195,6 +195,7 @@ namespace :build do "--with-message-pack=#{binary_dir}", "--with-ruby", "--enable-mruby", + "--enable-shared-onigmo", ] if mecab_config.exist? options << "--with-mecab-config=#{mecab_config}" Modified: vendor/onigmo/configure (+3 -0) =================================================================== --- vendor/onigmo/configure 2014-09-26 22:50:52 +0900 (a2bfa33) +++ vendor/onigmo/configure 2014-09-26 22:51:18 +0900 (41ef0a3) @@ -17,6 +17,9 @@ for argument in "$@"; do --enable-debug=*) options="${options} CFLAGS='-O0 -g3'" ;; + --enable-shared-onigmo) + options="${options} --enable-shared" + ;; esac done -------------- next part -------------- HTML����������������������������...Download