From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 23 Mar 2014 18:44:27 +0000 (+0100)
Subject: Make SSL and syslog support non-configurable
X-Git-Tag: 0.11.0~91
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ca1209d739f9c4f0e79f2b7cdc2734dde6bb7219;ds=inline

Make SSL and syslog support non-configurable

Both features have no external dependencies; SSL support requires Qt
to be built with SSL support, and syslog support requires the existence
of the syslog.h header. It makes no sense to make this configurable,
as no additional libraries or other dependencies are pulled in.

Instead, just add them to the feature_summary depending on the prerequisites
being in place.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ffb5291..19965576 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -305,44 +305,8 @@ if (NOT WIN32)
     )
 endif()
 
-# Setup OpenSSL
-# We don't link to or include OpenSSL ourselves, but use exclusively the Qt API.
-# Thus, we simply check if OpenSSL support is present in Qt's config and enable our
-# own SSL stuff in this case. Qt should care for adding what it needs itself.
-if(WITH_OPENSSL)
-  if(QT_QCONFIG MATCHES "openssl")
-    message(STATUS "Found OpenSSL support in Qt, enabling SSL")
-    add_definitions(-DHAVE_SSL)
-    set(HAVE_SSL true)
-  else(QT_QCONFIG MATCHES "openssl")
-    message(STATUS "No OpenSSL support found in Qt, disabling SSL")
-    add_definitions(-DQT_NO_OPENSSL)
-  endif(QT_QCONFIG MATCHES "openssl")
-else(WITH_OPENSSL)
-  message(STATUS "Not enabling OpenSSL support")
-endif(WITH_OPENSSL)
-
-# Core-only deps
-if(BUILD_CORE)
-
-  # Setup syslog support
-  if(WITH_SYSLOG)
-    check_include_file(syslog.h HAVE_SYSLOG_H)
-    if(HAVE_SYSLOG_H)
-      message(STATUS "Enabling syslog support")
-      set(HAVE_SYSLOG true)
-      add_definitions(-DHAVE_SYSLOG)
-    else(HAVE_SYSLOG_H)
-      message(STATUS "Disabling syslog support")
-    endif(HAVE_SYSLOG_H)
-  else(WITH_SYSLOG)
-    message(STATUS "Not enabling syslog support")
-  endif(WITH_SYSLOG)
-
-endif(BUILD_CORE)
-
 
-#
+# Various checks
 #####################################################################
 
 if (NOT ZLIB_FOUND)
@@ -360,6 +324,20 @@ if (KDE4_FOUND)
     add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
 endif()
 
+# Check for SSL support in Qt (broken for Qt5 currently)
+# We don't link to the OpenSSL libraries ourselves.
+if (QT_QCONFIG MATCHES "openssl")
+    set(HAVE_SSL true)
+    add_definitions(-DHAVE_SSL)
+endif()
+add_feature_info("SSL support in Qt" HAVE_SSL "Use secure network connections")
+
+# Check for syslog support
+if (NOT WIN32)
+    check_include_file(syslog.h HAVE_SYSLOG)
+    add_feature_info("syslog.h" HAVE_SYSLOG "Provide support for logging to the syslog")
+endif()
+
 
 # Various settings
 ##################
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index b2f9c71a..36218f46 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -57,6 +57,10 @@ else()
     set(SOURCES ${SOURCES} ../../3rdparty/miniz/miniz.c)
 endif()
 
+if (HAVE_SYSLOG)
+    add_definitions(-DHAVE_SYSLOG)
+endif()
+
 if(APPLE)
   set(SOURCES ${SOURCES} mac_utils.cpp)
 endif(APPLE)