Various buildsystem improvements:

- Find and use execinfo.h on non-Linux systems, thanks to sph for providing the patch
- Make OpenSSL and D-Bus support optional (-DWITH_OPENSSL=OFF, -DWITH_DBUS=OFF)
  Those options default to ON, which means they're enabled if the needed libs are found.
- For SSL being enabled in Quassel, now both OpenSSL headers/libs and SSL support in Qt
  must be present. This now sets -DHAVE_SSL which should be preferred over -DQT_NO_OPENSSL
  in the future (not changed in code yet).

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f24251..69945fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
 # This is the cmake-based build system for Quassel IRC.
 # You may pass various options to cmake:
 # -DWANT_(CORE|QTCLIENT|MONO)=(ON|OFF)
 # This is the cmake-based build system for Quassel IRC.
 # You may pass various options to cmake:
 # -DWANT_(CORE|QTCLIENT|MONO)=(ON|OFF)

-#                  : select binaries to build
-# -DQT=/path/to/qt : Choose a Qt4 installation to use instead of the system Qt4
-# -DSTATIC=ON      : Enable static building of Quassel. Use with care.
-# -DSPUTDEV=ON     : Do not use.
-# -DDEPLOY=ON      : Mac OS X only. Use only fore redistribution Quassel Packages!!
+#                     : select binaries to build
+# -DWITH_OPENSSL=OFF  : Disable OpenSSL support
+# -DWITH_DBUS=OFF     : Disable D-Bus support
+# -DQT=/path/to/qt    : Choose a Qt4 installation to use instead of the system Qt4
+# -DSTATIC=ON         : Enable static building of Quassel. Use with care.
+# -DSPUTDEV=ON        : Do not use.
+# -DDEPLOY=ON         : Mac OS X only. Use only fore redistribution Quassel Packages!!

 #
 # NOTE: You need to remove CMakeCache.txt if you plan to change any of these values!
 
 #
 # NOTE: You need to remove CMakeCache.txt if you plan to change any of these values!
 


@@ -15,7 +17,7 @@ project(QuasselIRC)
 cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
 
 if(COMMAND cmake_policy)
 cmake_minimum_required(VERSION 2.4.7 FATAL_ERROR)
 
 if(COMMAND cmake_policy)

-   cmake_policy(SET CMP0003 OLD)  # suppress linker warnings
+   cmake_policy(SET CMP0003 NEW)

 endif(COMMAND cmake_policy)
 
 # Use our own (well, KDE's) version of some modules
 endif(COMMAND cmake_policy)
 
 # Use our own (well, KDE's) version of some modules


@@ -27,13 +29,16 @@ option(WANT_CORE     "Build the core (server) binary"           ON)
 option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
 option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
 
 option(WANT_QTCLIENT "Build the Qt4 GUI client binary"          ON)
 option(WANT_MONO     "Build the monolithic (all-in-one) binary" OFF)
 

+option(WITH_OPENSSL  "Enable OpenSSL support if present on the system" ON)
+option(WITH_DBUS     "Enable D-Bus support if present on the system"   ON)
+

 option(STATIC        "Enable static building (might not be portable)" OFF)
 option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
 option(SPUTDEV       "Do not use!" OFF)
 
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
 set(LINGUAS "" CACHE STRING "Space-separated List of locales specifying languages that should be compiled")
 option(STATIC        "Enable static building (might not be portable)" OFF)
 option(DEPLOY        "Mac OS X only! Adds required libs to bundle resources and create a dmg. Note: requires Qt to be built with 10.4u SDK" OFF)
 option(SPUTDEV       "Do not use!" OFF)
 
 set(QT "" CACHE STRING "Path to a Qt installation to use instead of the system Qt")
 set(LINGUAS "" CACHE STRING "Space-separated List of locales specifying languages that should be compiled")

- 
+

 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)
 if(STATIC)
   set(CMAKE_BUILD_TYPE Release)
 endif(STATIC)


@@ -73,11 +78,40 @@ if(SPUTDEV)
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 
   add_definitions(-DSPUTDEV)
 endif(SPUTDEV)
 

-# Set up OpenSSL
-find_package(OpenSSL)
-if(NOT OPENSSL_FOUND)
-  add_definitions(-DQT_NO_OPENSSL)
-endif(NOT OPENSSL_FOUND)
+# Set up execinfo
+
+# The problem with this library is that it is built-in in the Linux glib, 
+# while on systems like FreeBSD, it is installed separately and thus needs to be linked to.
+# Therefore, we search for the header to see if the it's available in the first place.
+# If it is available, we try to locate the library to figure out whether it is built-in or not.
+
+find_path(EXECINFO_H_DIR "execinfo.h")
+
+if(NOT EXECINFO_H_DIR STREQUAL "EXECINFO_H_DIR-NOTFOUND")
+  # We found the header file's include dir.
+  # Let's add it so the compiler finds it as well.
+  include_directories(${EXECINFO_H_DIR})
+
+  # Now determine if it's built-in or not, by searching the library file.
+  find_library(EXECINFO_LIB_PATH "execinfo")
+
+  if(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+    # Built-in, no further action is needed
+    message(STATUS "Found execinfo")
+  else(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+    # It's an external library, link it.
+    link_libraries(${EXECINFO_LIB_PATH})
+    message(STATUS "Found execinfo: ${EXECINFO_LIB_PATH}")
+  endif(EXECINFO_LIB_PATH STREQUAL "EXECINFO_LIB_PATH-NOTFOUND")
+
+  set(HAVE_EXECINFO true)
+
+endif(NOT EXECINFO_H_DIR STREQUAL "EXECINFO_H_DIR-NOTFOUND")
+
+if(HAVE_EXECINFO)
+  add_definitions(-DHAVE_EXECINFO)
+endif(HAVE_EXECINFO)
+

 
 # Select a Qt installation here, if you don't want to use system Qt
 if(QT)
 
 # Select a Qt installation here, if you don't want to use system Qt
 if(QT)


@@ -88,16 +122,29 @@ endif(QT)
 # Now that we have the correct $PATH, lets find Qt!
 find_package(Qt4 REQUIRED)
 
 # Now that we have the correct $PATH, lets find Qt!
 find_package(Qt4 REQUIRED)
 

-if(QT_QTDBUS_FOUND)
-  add_definitions(-DHAVE_DBUS)
-  set(LINK_DBUS DBUS)
-  set(HAVE_DBUS true)
-endif(QT_QTDBUS_FOUND)
-

 set(QT_DONT_USE_QTGUI 1)
 include(${QT_USE_FILE})
 include_directories(${QT_INCLUDES})
 
 set(QT_DONT_USE_QTGUI 1)
 include(${QT_USE_FILE})
 include_directories(${QT_INCLUDES})
 

+# Set up OpenSSL
+if(WITH_OPENSSL)
+  find_package(OpenSSL)
+endif(WITH_OPENSSL)
+if(OPENSSL_FOUND)
+  if(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+    add_definitions(-DHAVE_SSL)
+    set(HAVE_SSL true)
+  endif(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+else(OPENSSL_FOUND)
+  add_definitions(-DQT_NO_OPENSSL)
+endif(OPENSSL_FOUND)
+
+if(WITH_DBUS AND QT_QTDBUS_FOUND)
+  add_definitions(-DHAVE_DBUS)
+  set(LINK_DBUS DBUS)
+  set(HAVE_DBUS true)
+endif(WITH_DBUS AND QT_QTDBUS_FOUND)
+

 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.
 add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)
 # We need to create a version.gen
 # For this, we create our genversion binary and make sure it is run every time.
 add_executable(genversion ${CMAKE_SOURCE_DIR}/src/common/genversion.cpp)


@@ -141,16 +188,16 @@ qt4_add_resources(RC_SQL src/core/sql.qrc)
 if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "-static-libgcc ${CMAKE_CXX_FLAGS}")
   link_directories(${CMAKE_BINARY_DIR}/staticlibs) # override dynamic libs
 if(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "-static-libgcc ${CMAKE_CXX_FLAGS}")
   link_directories(${CMAKE_BINARY_DIR}/staticlibs) # override dynamic libs

-  if(OPENSSL_FOUND)
+  if(HAVE_SSL)

     set(QUASSEL_SSL_LIBRARIES ssl crypto)  # these miss in static builds
     set(QUASSEL_SSL_LIBRARIES ssl crypto)  # these miss in static builds

-  endif(OPENSSL_FOUND)
+  endif(HAVE_SSL)

 endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 
 if(STATIC AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/
 endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 
 if(STATIC AND WIN32)
   link_libraries(imm32 winmm)  # missing by default :/

-   if(OPENSSL_FOUND)
+   if(HAVE_SSL)

      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)
      link_libraries(${OPENSSL_LIBRARIES} libeay32MD)

-   endif(OPENSSL_FOUND)
+   endif(HAVE_SSL)

 endif(STATIC AND WIN32)
 
 if(WIN32)
 endif(STATIC AND WIN32)
 
 if(WIN32)

diff --git a/src/common/main.cpp b/src/common/main.cpp
index daca412..aa1c75a 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -54,7 +54,7 @@
 
 #include <signal.h>
 
 
 #include <signal.h>
 

-#ifdef Q_OS_LINUX
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)

 #include <execinfo.h>
 #include <dlfcn.h>
 #include <cxxabi.h>
 #include <execinfo.h>
 #include <dlfcn.h>
 #include <cxxabi.h>


@@ -66,8 +66,9 @@ void handle_signal(int sig) {
   QCoreApplication::quit();
 }
 
   QCoreApplication::quit();
 }
 

-#ifdef Q_OS_LINUX
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)

 void handle_crash(int sig) {
 void handle_crash(int sig) {

+  Q_UNUSED(sig)

   void* callstack[128];
   int i, frames = backtrace(callstack, 128);
 
   void* callstack[128];
   int i, frames = backtrace(callstack, 128);
 


@@ -128,7 +129,7 @@ void handle_crash(int sig) {
   dumpFile.close();
   exit(27);
 }
   dumpFile.close();
   exit(27);
 }

-#endif // #ifdef Q_OS_LINUX
+#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)

 
 
 int main(int argc, char **argv) {
 
 
 int main(int argc, char **argv) {


@@ -136,11 +137,11 @@ int main(int argc, char **argv) {
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 
   signal(SIGTERM, handle_signal);
   signal(SIGINT, handle_signal);
 

-#ifdef Q_OS_LINUX
+#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)

   signal(SIGABRT, handle_crash);
   signal(SIGBUS, handle_crash);
   signal(SIGSEGV, handle_crash);
   signal(SIGABRT, handle_crash);
   signal(SIGBUS, handle_crash);
   signal(SIGSEGV, handle_crash);

-#endif // #ifdef Q_OS_LINUX
+#endif // #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)

   
   Global::registerMetaTypes();
   Global::setupVersion();
   
   Global::registerMetaTypes();
   Global::setupVersion();


@@ -168,8 +169,6 @@ int main(int argc, char **argv) {
   QtUiApplication app(argc, argv);
 #endif
 
   QtUiApplication app(argc, argv);
 #endif
 

-
-

   Global::parser = CliParser(QCoreApplication::arguments());
 
 #ifndef BUILD_QTUI
   Global::parser = CliParser(QCoreApplication::arguments());
 
 #ifndef BUILD_QTUI

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index d73be7c..8198773 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -52,11 +52,11 @@ set(HEADERS
     coresettings.h
     coreusersettings.h)
 
     coresettings.h
     coreusersettings.h)
 

-if(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+if(HAVE_SSL)

   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)
   include_directories(${OPENSSL_INCLUDE_DIR})
   set(SOURCES ${SOURCES} sslserver.cpp)
   set(MOC_HDRS ${MOC_HDRS} sslserver.h)
   include_directories(${OPENSSL_INCLUDE_DIR})

-endif(OPENSSL_FOUND AND NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
+endif(HAVE_SSL)

 
 QT4_WRAP_CPP(MOC ${MOC_HDRS})
 
 
 QT4_WRAP_CPP(MOC ${MOC_HDRS})
 

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index b6879bb..460f10a 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -796,6 +796,8 @@ void IrcServerHandler::handle324(const QString &prefix, const QList<QByteArray>
 /* RPL_??? - "<channel> <creation time (unix)>" */
 void IrcServerHandler::handle329(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix);
 /* RPL_??? - "<channel> <creation time (unix)>" */
 void IrcServerHandler::handle329(const QString &prefix, const QList<QByteArray> &params) {
   Q_UNUSED(prefix);

+  Q_UNUSED(params)
+#warning "Implement handle329 (Channel creation time)"

   // FIXME implement this... 
 }
 
   // FIXME implement this... 
 }