From 60969112525cf99f05507803324900f8a22a56b7 Mon Sep 17 00:00:00 2001
From: Jan-Piet Mens <jp@mens.de>
Date: Sun, 7 Aug 2022 17:19:32 +0200
Subject: [PATCH] NEW: WITH_TOURS is configured in by default

---
 config.mk.in              | 8 ++++++--
 etc/centos/config.mk.in   | 3 ++-
 etc/centos/fpm-make.sh    | 1 +
 etc/debian/config.mk.in   | 3 ++-
 etc/debian/fpm-make.sh    | 1 +
 etc/raspbian/config.mk.in | 3 ++-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config.mk.in b/config.mk.in
index db896b8..6fd674d 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -40,7 +40,8 @@ WITH_MQTT ?= yes
 WITH_HTTP ?= yes
 
 # Do you want recorder support for shared views? Requires WITH_HTTP
-WITH_TOURS ?= no
+# also requires -luuid on Linux (see below at MORELIBS)
+WITH_TOURS ?= yes
 
 # Do you have Lua libraries installed and want the Lua hook integration?
 WITH_LUA ?= no
@@ -91,7 +92,10 @@ CONFIGFILE = /etc/default/ot-recorder
 # Optionally specify the path to the Mosquitto libs, include here
 MOSQUITTO_INC = -I/usr/include
 MOSQUITTO_LIB = -L/usr/lib
-MORELIBS += # -luuid -lssl
+
+# Debian requires uuid-dev
+# RHEL/CentOS needs libuuid-devel
+MORELIBS += -luuid # -lssl
 
 # Milliseconds (ms) timeout for reverse geocoding
 GEOCODE_TIMEOUT = 4000
diff --git a/etc/centos/config.mk.in b/etc/centos/config.mk.in
index 0b9eea9..3d552db 100644
--- a/etc/centos/config.mk.in
+++ b/etc/centos/config.mk.in
@@ -6,6 +6,7 @@ FREEBSD ?= no
 
 WITH_MQTT ?= yes
 WITH_HTTP ?= yes
+WITH_TOURS ?= yes
 WITH_LUA ?= yes
 WITH_PING ?= yes
 WITH_KILL ?= yes
@@ -18,7 +19,7 @@ GHASHPREC = 7
 JSON_INDENT ?= no
 MOSQUITTO_INC = -I/usr/include
 MOSQUITTO_LIB = -L/usr/lib
-MORELIBS = # -lssl
+MORELIBS = -luuid # -lssl
 LUA_CFLAGS = `pkg-config --cflags lua`
 LUA_LIBS   = `pkg-config --libs lua`
 
diff --git a/etc/centos/fpm-make.sh b/etc/centos/fpm-make.sh
index 0699de0..f0880c9 100755
--- a/etc/centos/fpm-make.sh
+++ b/etc/centos/fpm-make.sh
@@ -35,6 +35,7 @@ fpm -s dir \
         -d "lua" \
         -d "libconfig" \
         -d "lmdb" \
+        -d "libuuid" \
 	--config-files etc/default/ot-recorder \
         --post-install etc/centos/postinst \
         usr var etc
diff --git a/etc/debian/config.mk.in b/etc/debian/config.mk.in
index 7c5b348..8e4cc1a 100644
--- a/etc/debian/config.mk.in
+++ b/etc/debian/config.mk.in
@@ -6,6 +6,7 @@ FREEBSD ?= no
 
 WITH_MQTT ?= yes
 WITH_HTTP ?= yes
+WITH_TOURS ?= yes
 WITH_LUA ?= yes
 WITH_PING ?= yes
 WITH_KILL ?= yes
@@ -18,7 +19,7 @@ GHASHPREC = 7
 JSON_INDENT ?= no
 MOSQUITTO_INC = -I/usr/include
 MOSQUITTO_LIB = -L/usr/lib
-MORELIBS = # -lssl
+MORELIBS = -luuid # -lssl
 LUA_CFLAGS = `pkg-config --cflags lua`
 LUA_LIBS   = `pkg-config --libs lua`
 SODIUM_CFLAGS = `pkg-config --cflags libsodium`
diff --git a/etc/debian/fpm-make.sh b/etc/debian/fpm-make.sh
index 535e995..1afc41a 100755
--- a/etc/debian/fpm-make.sh
+++ b/etc/debian/fpm-make.sh
@@ -57,6 +57,7 @@ fpm -s dir \
         -d "libconfig9" \
         -d "${libsodium}" \
         -d "liblmdb0" \
+        -d "libuuid1" \
 	--config-files etc/default/ot-recorder \
         --post-install etc/debian/postinst \
         usr var etc
diff --git a/etc/raspbian/config.mk.in b/etc/raspbian/config.mk.in
index 2c1797e..0d8886a 100644
--- a/etc/raspbian/config.mk.in
+++ b/etc/raspbian/config.mk.in
@@ -7,6 +7,7 @@ FREEBSD ?= no
 
 WITH_MQTT ?= yes
 WITH_HTTP ?= yes
+WITH_TOURS ?= yes
 WITH_LUA ?= yes
 WITH_PING ?= yes
 WITH_KILL ?= yes
@@ -19,7 +20,7 @@ GHASHPREC = 7
 JSON_INDENT ?= no
 MOSQUITTO_INC = -I/usr/include
 MOSQUITTO_LIB = -L/usr/lib
-MORELIBS = 
+MORELIBS = -luuid
 
 LUA_CFLAGS = -I/usr/include/lua5.2 -llua5.2
 LUA_LIBS   = -L /usr/lib/arm-linux-gnueabihf/