From 347723027c83faee91837b01599738fdf0e39e2d Mon Sep 17 00:00:00 2001
From: Roland Reichwein <mail@reichwein.it>
Date: Sat, 11 Dec 2021 15:48:21 +0100
Subject: Update supported compilers and OSes

---
 Makefile         |  2 +-
 common.mk        | 21 ++++++++++++++++++++-
 debian/changelog |  4 +++-
 debian/control   |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8db9403..ac2dabd 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ include common.mk
 
 VERSION=$(shell dpkg-parsechangelog --show-field Version)
 
-DISTROS=debian10 ubuntu2004 ubuntu2010
+DISTROS=debian11 ubuntu2110
 PROJECTNAME=webserver
 PLUGINS= \
          cgi \
diff --git a/common.mk b/common.mk
index 746d1a6..0a874b8 100644
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,16 @@
+CXX=clang++-13
+
+ifeq ($(shell which $(CXX)),)
+CXX=clang++-11
+endif
+
+ifeq ($(shell which $(CXX)),)
+CXX=g++-11
+endif
+
+ifeq ($(shell which $(CXX)),)
 CXX=g++-10
-#CXX=clang++-11
+endif
 
 ifeq ($(shell which $(CXX)),)
 CXX=g++-8
@@ -37,6 +48,10 @@ CXXFLAGS+=-Wall -I.
 CXXFLAGS+=-pthread
 ifeq ($(CXX),clang++-11)
 CXXFLAGS+=-std=c++20 #-stdlib=libc++
+else ifeq ($(CXX),clang++-13)
+CXXFLAGS+=-std=c++2b #-stdlib=libc++
+else ifeq ($(CXX),g++-11)
+CXXFLAGS+=-std=c++20 #-stdlib=libc++
 else
 CXXFLAGS+=-std=c++17
 endif
@@ -49,6 +64,10 @@ LIBS+= \
 #-lc++abi
 #-lc++fs
 #-lstdc++fs
+else ifeq ($(CXX),clang++-13)
+LIBS+= \
+-fuse-ld=lld-13 \
+-lstdc++
 else
 LIBS+= \
 -lstdc++ \
diff --git a/debian/changelog b/debian/changelog
index 3733e17..60ec99b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-webserver (1.15~beta1) unstable; urgency=medium
+webserver (1.15) unstable; urgency=medium
 
   * Improve MIME handling
+  * Support new compilers
+  * Support Debian 11 and Ubuntu 21.10
 
  -- Roland Reichwein <mail@reichwein.it>  Sat, 09 Oct 2021 16:08:52 +0200
 
diff --git a/debian/control b/debian/control
index 9738e34..ecfca81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: webserver
 Section: httpd
 Priority: optional
 Maintainer: Roland Reichwein <mail@reichwein.it>
-Build-Depends: debhelper (>= 12), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang | g++-9, node-uglify, python3-pkg-resources, htmlmin, cleancss
+Build-Depends: debhelper (>= 12), libssl-dev, libboost-all-dev | libboost1.71-all-dev, clang-13 | clang-11 | clang | g++-11 | g++, node-uglify, python3-pkg-resources, htmlmin, cleancss
 Standards-Version: 4.5.0
 Homepage: http://www.reichwein.it/webserver/
 
-- 
cgit v1.2.3