From: Petr Špaček <petr.spacek@nic.cz>
Date: Fri, 13 Jan 2017 16:46:11 +0000 (+0100)
Subject: build docs: detect Lua sec and socket libraries in make info
X-Git-Tag: v1.2.0-rc1~21^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6abf36b7f1efeba2154e5fa702c9120e5e5fc0;p=thirdparty%2Fknot-resolver.git

build docs: detect Lua sec and socket libraries in make info
---

diff --git a/Makefile b/Makefile
index 193f2f60f..3b6e53593 100644
--- a/Makefile
+++ b/Makefile
@@ -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 (modules/trust_anchors))
+	$(info [$(HAS_ssl.https)] Lua ssl.https (modules/trust_anchors))
 	$(info )
 
 # Verify required dependencies are met, as listed above
diff --git a/doc/build.rst b/doc/build.rst
index f4c67245b..c23aa816f 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -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
 
diff --git a/platform.mk b/platform.mk
index 6bbbb0a20..ad3367c18 100644
--- a/platform.mk
+++ b/platform.mk
@@ -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)