From 09ebd5487d7f20cce7afacfec9cd60c6ff9a1645 2018-12-01 11:39:11
From: Florian Kinder <florian.kinder@fankserver.com>
Date: 2018-12-01 11:39:11
Subject: [PATCH] build fixes

---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4d05b481afef6ed2cbd82f3ca718b2507d7eec3..88cb707bd22ce49fa5bdd36119b90bba80592849 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ message(STATUS "  |-libxml :                         -DLIBXML_LIBRARY")
 message(STATUS "|- boost   : -DBOOST_INCLUDEDIR,     -DBOOST_LIBRARYDIR")
 message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY")
 message(STATUS "           : -DPROTOBUF_PROTOC_EXECUTABLE")
-message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
+message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARIES")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 message(STATUS "|- pgxx    : -DPQXX_INCLUDE_DIR,     -DPQXX_LIBRARY")
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index d1cdece0e2a9f5aa12de54ec0d26f0ebf3b197f7..95e89ea674ef8925c614af9a136b68c2a5a5826e 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -45,7 +45,7 @@ RUN apk add --no-cache ca-certificates && \
 	rm -rf swift-* && \
 
 	cd spectrum2 && \
-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLOG4CXX_INCLUDE_DIR=/opt/log4cxx/include -DLOG4CXX_LIBRARY=/opt/log4cxx/lib -DSWIFTEN_INCLUDE_DIR=/opt/_swiften/include -DSWIFTEN_LIBRARY=/opt/_swiften/lib -DSWIFTEN_CONFIG_EXECUTABLE=/opt/_swiften/bin/swiften-config -DPQXX_INCLUDE_DIR=/opt/libpqxx/include -DPQXX_LIBRARY=/opt/libpqxx/lib -DPQ_LIBRARY=/opt/libpqxx/lib -DIRC_INCLUDE_DIR=/opt/libcommuni/include -DIRC_LIBRARY=/opt/libcommuni/lib -DIRC_MODEL_LIBRARY=/opt/libcommuni/lib && \
+	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLOG4CXX_INCLUDE_DIR=/opt/log4cxx/include -DLOG4CXX_LIBRARIES=/opt/log4cxx/lib/liblog4cxx.so -DSWIFTEN_INCLUDE_DIR=/opt/_swiften/include -DSWIFTEN_LIBRARY=/opt/_swiften/lib -DSWIFTEN_CONFIG_EXECUTABLE=/opt/_swiften/bin/swiften-config -DPQXX_INCLUDE_DIR=/opt/libpqxx/include -DPQXX_LIBRARY=/opt/libpqxx/lib/libpqxx.so -DPQ_LIBRARY=/opt/libpqxx/lib/libpqxx.so -DIRC_INCLUDE_DIR=/opt/libcommuni/include -DIRC_LIBRARY=/opt/libcommuni/lib/libIrcCore.so && \
 	make && \
 	make install && \
 	cd .. && \