Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-do Lua detection #6445

Merged
merged 1 commit into from Apr 9, 2018
Merged

Re-do Lua detection #6445

merged 1 commit into from Apr 9, 2018

Conversation

@pieterlexis
Copy link
Member

@pieterlexis pieterlexis commented Apr 4, 2018

Detect LuaJIT first, then other implementations. Allows setting
--with-lua to a specific implementation as well (e.g. lua51). Will
produce errors appropriately.

Fixes #6423.

TODO:

  • Check build scripts for --with-luajit usage
  • Check --version outputs
  • Check for $LUAPC and $LUAJITPC uages
  • Check if m4_foreach_w works as advertised

Short description

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
@pieterlexis pieterlexis requested a review from rgacogne Apr 4, 2018
@pieterlexis pieterlexis changed the title Re-do Lua detection [WIP] Re-do Lua detection Apr 5, 2018
@pieterlexis pieterlexis force-pushed the pieterlexis:with-lua-redo branch from dffae3f to 0373298 Apr 5, 2018
@pieterlexis pieterlexis changed the title [WIP] Re-do Lua detection Re-do Lua detection Apr 5, 2018
@pieterlexis pieterlexis requested a review from zeha Apr 5, 2018
AC_MSG_ERROR([Selected Lua not found])
])
], [
PKG_CHECK_MODULES([LUA], [luajit], [LUAPC=luajit], [ : ])

This comment has been minimized.

@rgacogne

rgacogne Apr 5, 2018
Member

Don't we need to define AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua]) in the action-if-found? Or is it done by PKG_CHECK_MODULES already?

This comment has been minimized.

@pieterlexis

pieterlexis Apr 5, 2018
Author Member

you are right!

Detect LuaJIT first, then other implementations. Allows setting
`--with-lua` to a specific implementation as well (e.g. `lua51`). Will
produce errors appropriately.

Fixes #6423.
@pieterlexis pieterlexis force-pushed the pieterlexis:with-lua-redo branch from 0373298 to 026090e Apr 5, 2018
Copy link
Member

@rgacogne rgacogne left a comment

LGTM!

@pieterlexis pieterlexis merged commit dbda697 into PowerDNS:master Apr 9, 2018
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@pieterlexis pieterlexis deleted the pieterlexis:with-lua-redo branch Apr 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants