Skip to content
Snippets Groups Projects
Commit 7df3469f authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge !138: build docs: detect Lua sec and socket libraries

parents 78ac4485 abeaa4c3
Branches
Tags
1 merge request!138build docs: detect Lua sec and socket libraries in make info
......@@ -22,6 +22,8 @@ $(eval $(call find_lib,lmdb))
$(eval $(call find_lib,libuv,1.0,yes))
$(eval $(call find_lib,nettle,,yes))
$(eval $(call find_alt,lua,luajit))
$(eval $(call find_luapkg,ltn12))
$(eval $(call find_luapkg,ssl.https))
$(eval $(call find_lib,cmocka))
$(eval $(call find_bin,doxygen))
$(eval $(call find_bin,sphinx-build))
......@@ -105,6 +107,8 @@ info:
$(info [$(HAS_cmocka)] cmocka (tests/unit))
$(info [$(HAS_libsystemd)] systemd (daemon))
$(info [$(HAS_nettle)] nettle (modules/cookies))
$(info [$(HAS_ltn12)] Lua socket ltn12 (trust anchor bootstrapping))
$(info [$(HAS_ssl.https)] Lua ssl.https (trust anchor bootstrapping))
$(info )
# Verify required dependencies are met, as listed above
......
......@@ -83,7 +83,7 @@ Most of the dependencies can be resolved from packages, here's an overview for s
# integration tests
sudo dnf install cmake git python-dns python-jinja2
# optional features
sudo dnf install golang hiredis-devel libmemcached-devel systemd-devel
sudo dnf install golang hiredis-devel libmemcached-devel lua-sec-compat lua-socket-compat systemd-devel
# docs
sudo dnf install doxygen python-breathe python-sphinx
......
......@@ -183,6 +183,11 @@ define find_gopkg
HAS_$(1) := $(shell go list $(2) > /dev/null 2>&1 && echo yes || echo no)
endef
# Find Lua package
define find_luapkg
HAS_$(1) := $(shell luajit -l $(1) -e "os.exit(0)"> /dev/null 2>&1 && echo yes || echo no)
endef
# Find Python package
define find_pythonpkg
HAS_$(1) := $(shell python -c "import $(1)" > /dev/null 2>&1 && echo yes || echo no)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment