jenkins-bot has submitted this change and it was merged.
Change subject: (bug 44221) Improve detection of lua library location
......................................................................
(bug 44221) Improve detection of lua library location
In FreeBSD, pkg-config has Lua 5.1 listed as "lua-5.1". So check for
that in addition to "lua" and "lua5.1".
Bug: 44221
Change-Id: I21f16f7f866cc867143857d3e2efa617863c8595
---
M config.m4
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/config.m4 b/config.m4
index 3259d05..6af76be 100644
--- a/config.m4
+++ b/config.m4
@@ -13,9 +13,12 @@
dnl We need lua or fallback to luajit.
dnl Under debian package is known as 'lua5.1'
+ dnl Under freebsd package is known as 'lua-5.1'
PKG_CHECK_MODULES([LUA], [lua],, [
PKG_CHECK_MODULES([LUA], [lua5.1],, [
- PKG_CHECK_MODULES([LUA], [luajit])
+ PKG_CHECK_MODULES([LUA], [lua-5.1],, [
+ PKG_CHECK_MODULES([LUA], [luajit])
+ ])
])
])
--
To view, visit https://gerrit.wikimedia.org/r/52882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21f16f7f866cc867143857d3e2efa617863c8595
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
