Kouhei Sutou
null+****@clear*****
Tue Nov 11 18:56:28 JST 2014
Kouhei Sutou 2014-11-11 18:56:28 +0900 (Tue, 11 Nov 2014) New Revision: 39fecb210a5f992f8a39e655fcf12967d813b093 https://github.com/groonga/groonga/commit/39fecb210a5f992f8a39e655fcf12967d813b093 Message: Support Onigmo build without mruby Modified files: configure.ac lib/Makefile.am vendor/onigmo/Makefile.am Modified: configure.ac (+5 -0) =================================================================== --- configure.ac 2014-11-11 18:21:11 +0900 (274c04d) +++ configure.ac 2014-11-11 18:56:28 +0900 (46d82b4) @@ -1459,6 +1459,11 @@ AM_CONDITIONAL(WITH_SHARED_ONIGMO, test "$enable_shared_onigmo" = "yes") AC_DEFINE(GRN_WITH_ONIGMO, [1], [Use Onigmo.]) AC_CONFIG_SUBDIRS([vendor/onigmo]) +ONIGMO_CFLAGS="-I\$(top_srcdir)/vendor/onigmo-source" +ONIGMO_LIBS="\$(top_builddir)/vendor/onigmo-source/libonig.la" +AC_SUBST(ONIGMO_CFLAGS) +AC_SUBST(ONIGMO_LIBS) + # PCRE GRN_WITH_PCRE=no AC_ARG_WITH(pcre, Modified: lib/Makefile.am (+5 -4) =================================================================== --- lib/Makefile.am 2014-11-11 18:21:11 +0900 (760f883) +++ lib/Makefile.am 2014-11-11 18:56:28 +0900 (e52a41e) @@ -10,12 +10,12 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) + $(MRUBY_CFLAGS) \ + $(ONIGMO_CFLAGS) DEFAULT_INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/vendor/onigmo-source + -I$(top_srcdir)/include DEFS += -D_REENTRANT $(GRN_DEFS) -DGRN_DAT_EXPORT @@ -30,7 +30,8 @@ libgroonga_la_LIBADD = \ dat/libgrndat.la \ mrb/libgrnmrb.la \ $(MESSAGE_PACK_LIBS) \ - $(MRUBY_LIBS) + $(MRUBY_LIBS) \ + $(ONIGMO_LIBS) if WITH_LEMON BUILT_SOURCES = \ Modified: vendor/onigmo/Makefile.am (+3 -6) =================================================================== --- vendor/onigmo/Makefile.am 2014-11-11 18:21:11 +0900 (772bfb4) +++ vendor/onigmo/Makefile.am 2014-11-11 18:56:28 +0900 (03083bd) @@ -4,16 +4,13 @@ EXTRA_DIST = \ CONFIGURE_DEPENDENCIES = \ configure -ALL_DEPEND_TARGETS = +ALL_DEPEND_TARGETS = onigmo-all +CLEAN_DEPEND_TARGETS = onigmo-clean + 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 onigmo-all: cd ../onigmo-source && $(MAKE) all -------------- next part -------------- HTML����������������������������...Download