Yasuhiro Horimoto 2019-05-22 18:12:32 +0900 (Wed, 22 May 2019) Revision: c8f06d06bc943d8d3169e3c693d5b4dbbb1fd544 https://github.com/groonga/groonga/commit/c8f06d06bc943d8d3169e3c693d5b4dbbb1fd544 Message: Add support LuaJIT (#963) * configure.ac: add support LuaJIT * configure.ac: fix a typo * configure.ac: add missing macros * configure.ac: fix indents * Move location for LUAJIT_CFLAGS * travis: add installation of LuaJIT * Makefile.am: remove needless trailing backslash * Makefile.am: fix a wrong location * Makefile.am: add missing definitions * Makefile.am: remove a needless trailing space Modified files: .travis.yml configure.ac lib/Makefile.am lib/mrb/Makefile.am lib/proc/Makefile.am plugins/suggest/Makefile.am src/Makefile.am Modified: .travis.yml (+1 -0) =================================================================== --- .travis.yml 2019-05-22 17:37:59 +0900 (b0c3ddc33) +++ .travis.yml 2019-05-22 18:12:32 +0900 (8b102a002) @@ -22,6 +22,7 @@ addons_linux_build: &addons_linux_build - libmsgpack-dev - libevent-dev - libmecab-dev + - libluajit-5.1-dev - mecab-naist-jdic - cmake - gdb Modified: configure.ac (+33 -0) =================================================================== --- configure.ac 2019-05-22 17:37:59 +0900 (4683dfc06) +++ configure.ac 2019-05-22 18:12:32 +0900 (9b24771d3) @@ -897,6 +897,34 @@ else GRN_WITH_LZ4=no fi +# LuaJIT +AC_ARG_WITH(luajit, + [AS_HELP_STRING([--with-luajit], + [Support LuaJIT. [default=auto]])], + [with_luajit="$withval"], + [with_luajit="auto"]) +if test "x$with_luajit" != "xno"; then + m4_ifdef([PKG_CHECK_MODULES], [ + PKG_CHECK_MODULES([LUAJIT], + [luajit], + [GRN_WITH_LUAJIT=yes], + [GRN_WITH_LUAJIT=no]) + ], + [GRN_WITH_LUAJIT=no]) + if test "$GRN_WITH_LUAJIT" = "yes"; then + AC_DEFINE(GRN_WITH_LUAJIT, [1], + [Support LuaJIT.]) + else + if test "x$with_luajit" != "xauto"; then + AC_MSG_ERROR("No LuaJIT found") + fi + fi +else + GRN_WITH_LUAJIT=no +fi +AC_SUBST(LUAJIT_CFLAGS) +AC_SUBST(LUAJIT_LIBS) + # Zstandard AC_ARG_WITH(zstd, [AS_HELP_STRING([--with-zstd], @@ -1784,6 +1812,11 @@ if test "x$GRN_WITH_LZ4" = "xyes"; then echo " CFLAGS: ${LIBLZ4_CFLAGS}" echo " LIBS: ${LIBLZ4_LIBS}" fi +echo " LuaJIT: $GRN_WITH_LUAJIT" +if test "x$GRN_WITH_LUAJIT" = "xyes"; then + echo " CFLAGS: ${LUAJIT_CFLAGS}" + echo " LIBS: ${LUAJIT_LIBS}" +fi echo " Zstandard: $GRN_WITH_ZSTD" if test "x$GRN_WITH_ZSTD" = "xyes"; then echo " CFLAGS: ${LIBZSTD_CFLAGS}" Modified: lib/Makefile.am (+2 -1) =================================================================== --- lib/Makefile.am 2019-05-22 17:37:59 +0900 (988dbaaab) +++ lib/Makefile.am 2019-05-22 18:12:32 +0900 (6cc073b49) @@ -19,7 +19,8 @@ AM_CFLAGS = \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ $(LIBLZ4_CFLAGS) \ - $(LIBZSTD_CFLAGS) + $(LIBZSTD_CFLAGS) \ + $(LUAJIT_CFLAGS) AM_CXXFLAGS = \ $(NO_STRICT_ALIASING_CFLAGS) \ Modified: lib/mrb/Makefile.am (+2 -1) =================================================================== --- lib/mrb/Makefile.am 2019-05-22 17:37:59 +0900 (bc3634612) +++ lib/mrb/Makefile.am 2019-05-22 18:12:32 +0900 (0eae9820d) @@ -13,7 +13,8 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) + $(MRUBY_CFLAGS) \ + $(LUAJIT_CFLAGS) noinst_LTLIBRARIES = libgrnmrb.la Modified: lib/proc/Makefile.am (+2 -1) =================================================================== --- lib/proc/Makefile.am 2019-05-22 17:37:59 +0900 (02b76f6b9) +++ lib/proc/Makefile.am 2019-05-22 18:12:32 +0900 (b807b278e) @@ -9,7 +9,8 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) + $(MRUBY_CFLAGS) \ + $(LUAJIT_CFLAGS) noinst_LTLIBRARIES = libgrnproc.la Modified: plugins/suggest/Makefile.am (+2 -1) =================================================================== --- plugins/suggest/Makefile.am 2019-05-22 17:37:59 +0900 (18c7e0a06) +++ plugins/suggest/Makefile.am 2019-05-22 18:12:32 +0900 (0eebf886d) @@ -3,7 +3,8 @@ EXTRA_DIST = \ AM_CFLAGS = \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) + $(MRUBY_CFLAGS) \ + $(LUAJIT_CFLAGS) AM_CPPFLAGS = \ -I$(top_builddir) \ Modified: src/Makefile.am (+2 -1) =================================================================== --- src/Makefile.am 2019-05-22 17:37:59 +0900 (52c4aff21) +++ src/Makefile.am 2019-05-22 18:12:32 +0900 (e38f39047) @@ -19,7 +19,8 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GRN_CFLAGS) \ $(MESSAGE_PACK_CFLAGS) \ - $(MRUBY_CFLAGS) + $(MRUBY_CFLAGS) \ + $(LUAJIT_CFLAGS) AM_CPPFLAGS = \ $(MRUBY_CPPFLAGS) -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190522/39eed13d/attachment-0001.html>
