merge 'default' into JSON-156 branch.

README.md

@@ -44,6 +44,9 @@ section below.
 Build and install the pEp Engine.  Instructions can be found here:
 [https://cacert.pep.foundation/dev/repos/pEpEngine/file/ef23982e4744/README.md](https://cacert.pep.foundation/dev/repos/pEpEngine/file/ef23982e4744/README.md).
 
+Build and install the pEp Webserver.  Instructions can be found here:
+[pEp webserver README](https://gitea.pep.foundation/fdik/webserver/src/branch/master/README.md)
+
 ### Build and install libevent
 
 It is recommended to use the libevent from your system's repository, if it contains the right version.

server/Makefile

@@ -19,11 +19,11 @@ BOOST_LIBRARY_PATH?=../../boost_1_72_0/stage/lib
 
 # path to installed libraries
 
-PREFIX=$(HOME)
+PREFIX?=$(HOME)
 
 PEP_INCLUDE?=$(PREFIX)/include
 
-LIBRARY_PATH?=/opt/local/lib
+LIBRARY_PATH?=$(PREFIX)/lib
 
 GMP_LIBRARY_PATH?=$(LIBRARY_PATH)
 SQLITE3_LIBRARY_PATH?=$(LIBRARY_PATH)
@@ -178,10 +178,6 @@ local.conf:
 	@echo "# path where to find GNU iconv" >> local.conf
 	@echo >> local.conf
 	@echo "ICONV_LIBRARY_PATH=$(ICONV_LIBRARY_PATH)" >> local.conf
-	@echo >> local.conf
-	@echo "# path where to find libevent" >> local.conf
-	@echo >> local.conf
-	@echo "LIBEVENT_LIBRARY_PATH=$(LIBEVENT_LIBRARY_PATH)" >> local.conf
 
 help:
 	@echo "usage:"

server/context.hh

@@ -1,6 +1,8 @@
 #ifndef JSON_ADAPTER_CONTEXT_HH
 #define JSON_ADAPTER_CONTEXT_HH
 
+#include <string>
+#include <functional>
 #include <map>
 #include <pEp/pEpEngine.h>