From 8c337984bde9a5e005212d34c4916752c724dc61 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Mon, 21 Aug 2017 18:08:19 +0200
Subject: Documentation and LUA for Ubuntu

---
 conf.d/app-templates      |  2 +-
 conf.d/cmake/config.cmake | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'conf.d')

diff --git a/conf.d/app-templates b/conf.d/app-templates
index 350c5b9..3a90fb6 160000
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit 350c5b97459226f7e031c73edb3a79a2d99cb250
+Subproject commit 3a90fb6f2c4518ebab484cde90919c19456dc04c
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index b5e3a4c..5d35862 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -47,6 +47,14 @@ set (gcc_minimal_version 4.9)
 #set(CMAKE_C_COMPILER "gcc")
 #set(CMAKE_CXX_COMPILER "g++")
 
+# When Present LUA is used by the controller
+# ---------------------------------------------------------------
+set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
+set(LUA_PKG lua>=5.3)
+if(OSRELEASE MATCHES "debian")
+set(LUA_PKG lua-5.3)
+endif()
+
 # PKG_CONFIG required packages
 # -----------------------------
 set (PKG_REQUIRED_LIST
@@ -56,7 +64,7 @@ set (PKG_REQUIRED_LIST
 	afb-daemon
 	json-c
         libafbwsc
-        lua>=5.3
+        ${LUA_PKG}
 )
 
 # Controller project needed variables.
@@ -64,7 +72,6 @@ set (PKG_REQUIRED_LIST
 # in the CMakeLists.txt of that target to correctly
 # expand variables.
 # ----------------------------------------------------
-set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
 set (CTL_PLUGIN_PRE "ctl-" CACHE STRING "Prefix for Controller share plugin")
 set (CTL_PLUGIN_EXT ".ctlso" CACHE STRING "Postfix for Controller share plugin")
 
-- 
cgit 1.2.3-korg