Making Quassel Core compile without SSL support

diff --git a/src/core/core.pri b/src/core/core.pri
index d202545..333c09d 100644 (file)
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -2,6 +2,11 @@ DEPMOD = common
 QT_MOD = core network sql script
 
 SRCS = core.cpp corebacklogmanager.cpp corebufferviewconfig.cpp corebufferviewmanager.cpp coresession.cpp coresettings.cpp networkconnection.cpp sqlitestorage.cpp abstractsqlstorage.cpp storage.cpp basichandler.cpp \
 QT_MOD = core network sql script
 
 SRCS = core.cpp corebacklogmanager.cpp corebufferviewconfig.cpp corebufferviewmanager.cpp coresession.cpp coresettings.cpp networkconnection.cpp sqlitestorage.cpp abstractsqlstorage.cpp storage.cpp basichandler.cpp \

-       ircserverhandler.cpp userinputhandler.cpp ctcphandler.cpp coreusersettings.cpp sessionthread.cpp sslserver.cpp
+       ircserverhandler.cpp userinputhandler.cpp ctcphandler.cpp coreusersettings.cpp sessionthread.cpp

 HDRS = core.h corebacklogmanager.h corebufferviewconfig.h corebufferviewmanager.h coresession.h coresettings.h networkconnection.h sqlitestorage.h abstractsqlstorage.h storage.h basichandler.h \
 HDRS = core.h corebacklogmanager.h corebufferviewconfig.h corebufferviewmanager.h coresession.h coresettings.h networkconnection.h sqlitestorage.h abstractsqlstorage.h storage.h basichandler.h \

-       ircserverhandler.h userinputhandler.h ctcphandler.h coreusersettings.h sessionthread.h sslserver.h
+       ircserverhandler.h userinputhandler.h ctcphandler.h coreusersettings.h sessionthread.h
+
+contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+    SRCS += sslserver.cpp
+    HDRS += sslserver.h
+}

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index b19ee5f..343af53 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -18,16 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#ifndef QT_NO_OPENSSL
-

 #include "sslserver.h"
 
 #include "sslserver.h"
 

-#include <QSslSocket>
+#ifndef QT_NO_OPENSSL
+#  include <QSslSocket>
+#endif
+

 #include <QFile>
 #include <QDebug>
 
 #include "util.h"
 
 #include <QFile>
 #include <QDebug>
 
 #include "util.h"
 

+#ifndef QT_NO_OPENSSL
+

 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index de6030a..fdbecbf 100644 (file)
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -18,15 +18,17 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 

-#ifndef QT_NO_OPENSSL
-

 #ifndef SSLSERVER_H
 #define SSLSERVER_H
 
 #ifndef SSLSERVER_H
 #define SSLSERVER_H
 

+#ifndef QT_NO_OPENSSL
+#  include <QSslCertificate>
+#  include <QSslKey>

 #include <QTcpServer>
 #include <QLinkedList>
 #include <QTcpServer>
 #include <QLinkedList>

-#include <QSslCertificate>
-#include <QSslKey>
+#endif
+
+#ifndef QT_NO_OPENSSL

 
 class SslServer : public QTcpServer {
   Q_OBJECT
 
 class SslServer : public QTcpServer {
   Q_OBJECT


@@ -51,6 +53,6 @@ private:
   bool _certIsValid;
 };
 
   bool _certIsValid;
 };
 

-#endif //SSLSERVER_H
-

 #endif //QT_NO_OPENSSL
 #endif //QT_NO_OPENSSL

+
+#endif //SSLSERVER_H