Kouhei Sutou
null+****@clear*****
Tue Dec 23 19:34:48 JST 2014
Kouhei Sutou 2014-12-23 19:34:48 +0900 (Tue, 23 Dec 2014) New Revision: 8c8aba7fe38c1867494546953ea711e450c42a3a https://github.com/groonga/groonga/commit/8c8aba7fe38c1867494546953ea711e450c42a3a Message: Specify mruby related flags as literal to resolve dependency Modified files: configure.ac lib/Makefile.am Modified: configure.ac (+0 -8) =================================================================== --- configure.ac 2014-12-23 00:58:40 +0900 (b58e8ea) +++ configure.ac 2014-12-23 19:34:48 +0900 (85e4439) @@ -1439,15 +1439,7 @@ if test "$enable_mruby" = "yes"; then AC_MSG_ERROR(--enable-ruby requires --with-ruby) fi AC_DEFINE(GRN_WITH_MRUBY, [1], [Define to 1 if mruby is enabled.]) - MRUBY_CFLAGS="-I\$(top_srcdir)/vendor/mruby-source/include" - MRUBY_LIBS="\$(top_builddir)/vendor/mruby/libmruby.la" - MRUBY_LIBS="${MRUBY_LIBS} \$(top_builddir)/vendor/onigmo-source/libonig.la" -else - MRUBY_CFLAGS= - MRUBY_LIBS= fi -AC_SUBST(MRUBY_CFLAGS) -AC_SUBST(MRUBY_LIBS) AM_CONDITIONAL(WITH_MRUBY, test "$enable_mruby" = "yes") # This option is used in vendor/onigmo/configure Modified: lib/Makefile.am (+10 -3) =================================================================== --- lib/Makefile.am 2014-12-23 00:58:40 +0900 (2ca65ea) +++ lib/Makefile.am 2014-12-23 19:34:48 +0900 (4b99b99) @@ -10,7 +10,6 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) \ $(ONIGMO_CFLAGS) \ $(LIBLZ4_CFLAGS) @@ -30,8 +29,16 @@ libgroonga_la_LDFLAGS = \ libgroonga_la_LIBADD = \ dat/libgrndat.la \ mrb/libgrnmrb.la \ - $(MESSAGE_PACK_LIBS) \ - $(MRUBY_LIBS) \ + $(MESSAGE_PACK_LIBS) + +if WITH_MRUBY +AM_CFLAGS += \ + ../vendor/mruby-source/include +libgroonga_la_LIBADD += \ + ../vendor/mruby/libmruby.la +endif + +libgroonga_la_LIBADD += \ $(ONIGMO_LIBS) \ $(LIBLZ4_LIBS) -------------- next part -------------- HTML����������������������������...다운로드
