Kouhei Sutou
null+****@clear*****
Wed Dec 21 22:01:10 JST 2016
Kouhei Sutou 2016-12-21 22:01:10 +0900 (Wed, 21 Dec 2016) New Revision: 20f8a7e38e9e91e43af1c54274a9534078a60db4 https://github.com/groonga/groonga/commit/20f8a7e38e9e91e43af1c54274a9534078a60db4 Message: Use Onigmo 6.0 Modified files: configure.ac lib/ctx.c lib/expr.c lib/ii.c lib/operator.c vendor/mruby/Makefile.am vendor/onigmo-source vendor/onigmo/configure Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2016-12-13 16:43:47 +0900 (81fb8c8) +++ configure.ac 2016-12-21 22:01:10 +0900 (1ec9f9d) @@ -1579,7 +1579,7 @@ AC_SUBST(GRN_WITH_ONIGMO) AC_CONFIG_SUBDIRS([vendor/onigmo]) ONIGMO_CFLAGS="-I\$(top_srcdir)/vendor/onigmo-source" -ONIGMO_LIBS="\$(top_builddir)/vendor/onigmo-source/libonig.la" +ONIGMO_LIBS="\$(top_builddir)/vendor/onigmo-source/libonigmo.la" AC_SUBST(ONIGMO_CFLAGS) AC_SUBST(ONIGMO_LIBS) Modified: lib/ctx.c (+1 -1) =================================================================== --- lib/ctx.c 2016-12-13 16:43:47 +0900 (bc70d38) +++ lib/ctx.c 2016-12-21 22:01:10 +0900 (517ba28) @@ -44,7 +44,7 @@ #endif /* GRN_WITH_ONIGMO */ #ifdef GRN_SUPPORT_REGEXP -# include <oniguruma.h> +# include <onigmo.h> #endif /* GRN_SUPPORT_REGEXP */ #ifdef WIN32 Modified: lib/expr.c (+1 -1) =================================================================== --- lib/expr.c 2016-12-13 16:43:47 +0900 (13a6067) +++ lib/expr.c 2016-12-21 22:01:10 +0900 (828842e) @@ -36,7 +36,7 @@ #ifdef GRN_SUPPORT_REGEXP # include "grn_normalizer.h" -# include <oniguruma.h> +# include <onigmo.h> #endif static double grn_table_select_enough_filtered_ratio = 0.0; Modified: lib/ii.c (+1 -1) =================================================================== --- lib/ii.c 2016-12-13 16:43:47 +0900 (05c4a84) +++ lib/ii.c 2016-12-21 22:01:10 +0900 (67714f1) @@ -40,7 +40,7 @@ #ifdef GRN_II_SELECT_ENABLE_SEQUENTIAL_SEARCH # include "grn_string.h" -# include <oniguruma.h> +# include <onigmo.h> #endif #define MAX_PSEG 0x20000 Modified: lib/operator.c (+1 -1) =================================================================== --- lib/operator.c 2016-12-13 16:43:47 +0900 (8b730be) +++ lib/operator.c 2016-12-21 22:01:10 +0900 (e323077) @@ -28,7 +28,7 @@ #endif #ifdef GRN_SUPPORT_REGEXP -# include <oniguruma.h> +# include <onigmo.h> #endif static const char *operator_names[] = { Modified: vendor/mruby/Makefile.am (+1 -0) =================================================================== --- vendor/mruby/Makefile.am 2016-12-13 16:43:47 +0900 (9731aa7) +++ vendor/mruby/Makefile.am 2016-12-21 22:01:10 +0900 (31d1764) @@ -26,6 +26,7 @@ noinst_LTLIBRARIES = libmruby.la AM_CPPFLAGS = \ -I$(srcdir)/../onigmo-source \ + -DHAVE_ONIGMO_H \ $(MRUBY_CPPFLAGS) if PLATFORM_WIN32 Modified: vendor/onigmo-source (+1 -1) =================================================================== --- vendor/onigmo-source 2016-12-13 16:43:47 +0900 (6b3ef03) +++ vendor/onigmo-source 2016-12-21 22:01:10 +0900 (f2d8ccc) @@ -1 +1 @@ -Subproject commit 6b3ef032153fd8b33e0abde4d4294091b0e794bc +Subproject commit f2d8ccc8d742bba4a298d66f36398cd3684e26bf Modified: vendor/onigmo/configure (+1 -1) =================================================================== --- vendor/onigmo/configure 2016-12-13 16:43:47 +0900 (9e60112) +++ vendor/onigmo/configure 2016-12-21 22:01:10 +0900 (67ea9a9) @@ -5,7 +5,7 @@ set -u srcdir="." builddir="." -options="--enable-multithread --with-pic --disable-shared --enable-static" +options="--with-pic --disable-shared --enable-static" for argument in "$@"; do case "$argument" in --srcdir=*) -------------- next part -------------- HTML����������������������������...下载
