Mercurial > irccd

changeset 84:c67e734c9241

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CMake: rename irccd-config.h to irccd/sysconfig.h, #452 While here, cleanup the file by removing useless stuff.
author David Demelier <markand@malikania.fr>
date Mon, 04 Apr 2016 22:34:24 +0200
parents f1a3026027f1
children 6d48d409e9e9
files CMakeLists.txt cmake/IrccdSystem.cmake cmake/internal/irccd-config.h.in cmake/internal/sysconfig.h.in irccd/main.cpp lib/irccd/cmd-plugin-info.cpp lib/irccd/cmd-plugin-list.cpp lib/irccd/cmd-plugin-load.cpp lib/irccd/cmd-plugin-reload.cpp lib/irccd/cmd-plugin-unload.cpp lib/irccd/config.cpp lib/irccd/irccd.h lib/irccd/irccdctl.cpp lib/irccd/js-directory.cpp lib/irccd/js-file.cpp lib/irccd/js-irccd.cpp lib/irccd/js-system.cpp lib/irccd/logger.cpp lib/irccd/logger.h lib/irccd/path.cpp lib/irccd/plugin.cpp lib/irccd/server-state.cpp lib/irccd/server-state.h lib/irccd/server.h lib/irccd/system.cpp lib/irccd/system.h lib/irccd/transport-server.h lib/irccd/util.cpp tests/js-irccd/main.cpp tests/js-logger/main.cpp tests/path/main.cpp
diffstat 31 files changed, 147 insertions(+), 135 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu Mar 31 14:07:53 2016 +0200
+++ b/CMakeLists.txt	Mon Apr 04 22:34:24 2016 +0200
@@ -29,7 +29,7 @@
 # cmake/check			- Platform checks in separate files.
 # cmake/function		- Custom functions.
 # cmake/installer		- Some files for the QtIFW installer.
-# cmake/internal		- Some internal files (e.g. the irccd-config.h)
+# cmake/internal		- Some internal files (e.g. the sysconfig.h)
 # cmake/packages		- Additional find_package modules.
 #
 # Build system is then processed in different directories:
--- a/cmake/IrccdSystem.cmake	Thu Mar 31 14:07:53 2016 +0200
+++ b/cmake/IrccdSystem.cmake	Mon Apr 04 22:34:24 2016 +0200
@@ -104,9 +104,9 @@
 endif ()
 
 #
-# Where any of these function / feature is required, include the <irccd-config.h> file.
+# Where any of these function / feature is required, include the <irccd/sysconfig.h> file.
 #
-# The following variables are defined in irccd-config.h
+# The following variables are defined in irccd/sysconfig.h
 #
 # HAVE_ACCESS		- True if has access(2) function (and sys/types.h and sys/stat.h),
 # HAVE_DAEMON		- True if daemon(3),
@@ -249,8 +249,23 @@
 check_struct_has_member("struct stat" st_size sys/stat.h HAVE_STAT_ST_SIZE)
 check_struct_has_member("struct stat" st_uid sys/stat.h HAVE_STAT_ST_UID)
 
-# Configuration file
+# Configuration file.
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/irccd)
+
 configure_file(
-	${CMAKE_CURRENT_LIST_DIR}/internal/irccd-config.h.in
-	${CMAKE_BINARY_DIR}/irccd-config.h
+	${CMAKE_CURRENT_LIST_DIR}/internal/sysconfig.h.in
+	${CMAKE_BINARY_DIR}/irccd/sysconfig.h
+)
+
+install(
+	FILES ${CMAKE_BINARY_DIR}/irccd/sysconfig.h
+	DESTINATION include/irccd
 )
+
+# Also copy to fakedir if possible
+if (IRCCD_RELOCATABLE)
+	file(
+		COPY ${CMAKE_BINARY_DIR}/irccd/sysconfig.h
+		DESTINATION ${IRCCD_FAKEDIR}/include/irccd
+	)
+endif ()
--- a/cmake/internal/irccd-config.h.in	Thu Mar 31 14:07:53 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
- * irccd-config.h -- configuration for irccd
- *
- * Copyright (c) 2013-2016 David Demelier <markand@malikania.fr>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _IRCCD_CONFIG_H_
-#define _IRCCD_CONFIG_H_
-
-/*
- * Fix annoying "Please include winsock2.h before windows.h"
- */
-#if defined(_WIN32)
-#  include <winsock2.h>
-#  include <windows.h>
-#endif
-
-/* --------------------------------------------------------
- * Auto generated from CMake
- * -------------------------------------------------------- */
-
-#define PREFIX			"@CMAKE_INSTALL_PREFIX@"
-
-#define IRCCD_VERSION_MAJOR	@IRCCD_VERSION_MAJOR@
-#define IRCCD_VERSION_MINOR	@IRCCD_VERSION_MINOR@
-#define IRCCD_VERSION_PATCH	@IRCCD_VERSION_PATCH@
-
-#cmakedefine IRCCD_RELOCATABLE
-
-/* --------------------------------------------------------
- * System identification
- * -------------------------------------------------------- */
-
-#cmakedefine IRCCD_SYSTEM_WINDOWS
-#cmakedefine IRCCD_SYSTEM_MAC
-#cmakedefine IRCCD_SYSTEM_FREEBSD
-#cmakedefine IRCCD_SYSTEM_NETBSD
-#cmakedefine IRCCD_SYSTEM_OPENBSD
-#cmakedefine IRCCD_SYSTEM_LINUX
-#cmakedefine IRCCD_SYSTEM_UNKNOWN
-
-/* --------------------------------------------------------
- * User definable options
- * -------------------------------------------------------- */
-
-#define WITH_BINDIR		"@WITH_BINDIR@"
-#define WITH_DATADIR		"@WITH_DATADIR@"
-#define WITH_CONFDIR		"@WITH_CONFDIR@"
-#define WITH_PLUGINDIR		"@WITH_PLUGINDIR@"
-#define WITH_CACHEDIR		"@WITH_CACHEDIR@"
-
-#cmakedefine WITH_JS
-#cmakedefine WITH_SSL
-
-/* --------------------------------------------------------
- * IRC tests
- * -------------------------------------------------------- */
-
-#define WITH_TEST_IRCHOST	"@WITH_TEST_IRCHOST@"
-#define WITH_TEST_IRCPORT	@WITH_TEST_IRCPORT@
-
-/* --------------------------------------------------------
- * Platform checks
- * -------------------------------------------------------- */
-
-#cmakedefine HAVE_ACCESS
-#cmakedefine HAVE_DAEMON
-#cmakedefine HAVE_GETPID
-#cmakedefine HAVE_POPEN
-#cmakedefine HAVE_SETGID
-#cmakedefine HAVE_SETPROGNAME
-#cmakedefine HAVE_SETUID
-#cmakedefine HAVE_STD_PUT_TIME
-#cmakedefine HAVE_STAT
-#cmakedefine HAVE_STAT_ST_ATIME
-#cmakedefine HAVE_STAT_ST_BLKSIZE
-#cmakedefine HAVE_STAT_ST_BLOCKS
-#cmakedefine HAVE_STAT_ST_CTIME
-#cmakedefine HAVE_STAT_ST_DEV
-#cmakedefine HAVE_STAT_ST_GID
-#cmakedefine HAVE_STAT_ST_INO
-#cmakedefine HAVE_STAT_ST_MODE
-#cmakedefine HAVE_STAT_ST_MTIME
-#cmakedefine HAVE_STAT_ST_NLINK
-#cmakedefine HAVE_STAT_ST_RDEV
-#cmakedefine HAVE_STAT_ST_SIZE
-#cmakedefine HAVE_STAT_ST_UID
-#cmakedefine HAVE_SYSLOG
-
-#endif // !_IRCCD_CONFIG_H_
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cmake/internal/sysconfig.h.in	Mon Apr 04 22:34:24 2016 +0200
@@ -0,0 +1,99 @@
+/*
+ * sysconfig.h -- configuration for irccd
+ *
+ * Copyright (c) 2013-2016 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef IRCCD_SYSCONFIG_H
+#define IRCCD_SYSCONFIG_H
+
+/*
+ * Fix annoying "Please include winsock2.h before windows.h"
+ */
+#if defined(_WIN32)
+#  include <winsock2.h>
+#  include <windows.h>
+#endif
+
+/*
+ * Auto generated from CMake.
+ * ------------------------------------------------------------------
+ */
+
+#define PREFIX			"@CMAKE_INSTALL_PREFIX@"
+
+#define IRCCD_VERSION_MAJOR	@IRCCD_VERSION_MAJOR@
+#define IRCCD_VERSION_MINOR	@IRCCD_VERSION_MINOR@
+#define IRCCD_VERSION_PATCH	@IRCCD_VERSION_PATCH@
+
+#cmakedefine IRCCD_RELOCATABLE
+
+/*
+ * System identification.
+ * ------------------------------------------------------------------
+ */
+
+#cmakedefine IRCCD_SYSTEM_WINDOWS
+#cmakedefine IRCCD_SYSTEM_MAC
+#cmakedefine IRCCD_SYSTEM_FREEBSD
+#cmakedefine IRCCD_SYSTEM_NETBSD
+#cmakedefine IRCCD_SYSTEM_OPENBSD
+#cmakedefine IRCCD_SYSTEM_LINUX
+#cmakedefine IRCCD_SYSTEM_UNKNOWN
+
+/*
+ * User definable options.
+ * ------------------------------------------------------------------
+ */
+
+#define WITH_BINDIR		"@WITH_BINDIR@"
+#define WITH_DATADIR		"@WITH_DATADIR@"
+#define WITH_CONFDIR		"@WITH_CONFDIR@"
+#define WITH_PLUGINDIR		"@WITH_PLUGINDIR@"
+#define WITH_CACHEDIR		"@WITH_CACHEDIR@"
+
+#cmakedefine WITH_JS
+#cmakedefine WITH_SSL
+
+/*
+ * Platform checks.
+ * ------------------------------------------------------------------
+ */
+
+#cmakedefine HAVE_ACCESS
+#cmakedefine HAVE_DAEMON
+#cmakedefine HAVE_GETPID
+#cmakedefine HAVE_POPEN
+#cmakedefine HAVE_SETGID
+#cmakedefine HAVE_SETPROGNAME
+#cmakedefine HAVE_SETUID
+#cmakedefine HAVE_STD_PUT_TIME
+#cmakedefine HAVE_STAT
+#cmakedefine HAVE_STAT_ST_ATIME
+#cmakedefine HAVE_STAT_ST_BLKSIZE
+#cmakedefine HAVE_STAT_ST_BLOCKS
+#cmakedefine HAVE_STAT_ST_CTIME
+#cmakedefine HAVE_STAT_ST_DEV
+#cmakedefine HAVE_STAT_ST_GID
+#cmakedefine HAVE_STAT_ST_INO
+#cmakedefine HAVE_STAT_ST_MODE
+#cmakedefine HAVE_STAT_ST_MTIME
+#cmakedefine HAVE_STAT_ST_NLINK
+#cmakedefine HAVE_STAT_ST_RDEV
+#cmakedefine HAVE_STAT_ST_SIZE
+#cmakedefine HAVE_STAT_ST_UID
+#cmakedefine HAVE_SYSLOG
+
+#endif // !IRCCD_SYSCONFIG_H
--- a/irccd/main.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/irccd/main.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <csignal>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <irccd/logger.h>
 #include <irccd/options.h>
--- a/lib/irccd/cmd-plugin-info.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/cmd-plugin-info.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <iostream>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "cmd-plugin-info.h"
 #include "irccd.h"
--- a/lib/irccd/cmd-plugin-list.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/cmd-plugin-list.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <iostream>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "cmd-plugin-list.h"
 #include "irccd.h"
--- a/lib/irccd/cmd-plugin-load.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/cmd-plugin-load.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "cmd-plugin-load.h"
 #include "irccd.h"
--- a/lib/irccd/cmd-plugin-reload.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/cmd-plugin-reload.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "cmd-plugin-reload.h"
 #include "irccd.h"
--- a/lib/irccd/cmd-plugin-unload.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/cmd-plugin-unload.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "cmd-plugin-unload.h"
 #include "irccd.h"
--- a/lib/irccd/config.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/config.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(HAVE_GETPID)
 #  include <sys/types.h>
--- a/lib/irccd/irccd.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/irccd.h	Mon Apr 04 22:34:24 2016 +0200
@@ -27,7 +27,7 @@
 #include <mutex>
 #include <vector>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "sockets.h"
 
--- a/lib/irccd/irccdctl.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/irccdctl.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -23,7 +23,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "elapsed-timer.h"
 #include "fs.h"
--- a/lib/irccd/js-directory.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/js-directory.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <string>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "fs.h"
 #include "js.h"
--- a/lib/irccd/js-file.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/js-file.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -19,7 +19,7 @@
 #include <array>
 #include <vector>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(HAVE_STAT)
 #  include <sys/types.h>
--- a/lib/irccd/js-irccd.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/js-irccd.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "js-irccd.h"
 
--- a/lib/irccd/js-system.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/js-system.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <chrono>
 
--- a/lib/irccd/logger.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/logger.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -23,7 +23,7 @@
 #include <stdexcept>
 #include <streambuf>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(HAVE_SYSLOG)
 #  include <syslog.h>
--- a/lib/irccd/logger.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/logger.h	Mon Apr 04 22:34:24 2016 +0200
@@ -19,7 +19,7 @@
 #ifndef IRCCD_LOGGER_H
 #define IRCCD_LOGGER_H
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <memory>
 #include <sstream>
--- a/lib/irccd/path.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/path.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -21,7 +21,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(IRCCD_SYSTEM_WINDOWS)
 #  include <Windows.h>
--- a/lib/irccd/plugin.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/plugin.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <stdexcept>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(HAVE_STAT)
 #  include <sys/stat.h>
--- a/lib/irccd/server-state.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/server-state.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <cassert>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if !defined(_WIN32)
 #  include <sys/types.h>
--- a/lib/irccd/server-state.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/server-state.h	Mon Apr 04 22:34:24 2016 +0200
@@ -19,7 +19,7 @@
 #ifndef IRCCD_SERVER_STATE_H
 #define IRCCD_SERVER_STATE_H
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "elapsed-timer.h"
 #include "sockets.h"
--- a/lib/irccd/server.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/server.h	Mon Apr 04 22:34:24 2016 +0200
@@ -30,7 +30,7 @@
 #include <utility>
 #include <vector>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "logger.h"
 #include "server-state.h"
--- a/lib/irccd/system.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/system.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -20,7 +20,7 @@
 #include <ctime>
 #include <stdexcept>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #if defined(HAVE_SETPROGNAME)
 #  include <cstdlib>
--- a/lib/irccd/system.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/system.h	Mon Apr 04 22:34:24 2016 +0200
@@ -24,7 +24,7 @@
  * @brief System dependant functions
  */
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <cstdint>
 #include <string>
--- a/lib/irccd/transport-server.h	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/transport-server.h	Mon Apr 04 22:34:24 2016 +0200
@@ -27,7 +27,7 @@
 #include <memory>
 #include <string>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "sockets.h"
 #include "transport-client.h"
--- a/lib/irccd/util.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/lib/irccd/util.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -24,7 +24,7 @@
 #include <sstream>
 #include <stdexcept>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include "util.h"
 #include "unicode.h"
--- a/tests/js-irccd/main.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/tests/js-irccd/main.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <irccd/js-irccd.h>
 #include <irccd/logger.h>
--- a/tests/js-logger/main.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/tests/js-logger/main.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <irccd/js-irccd.h>
 #include <irccd/js-logger.h>
--- a/tests/path/main.cpp	Thu Mar 31 14:07:53 2016 +0200
+++ b/tests/path/main.cpp	Mon Apr 04 22:34:24 2016 +0200
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include <irccd-config.h>
+#include <irccd/sysconfig.h>
 
 #include <irccd/logger.h>
 #include <irccd/path.h>