From 56c72080acac36c153f3510cbb503b33a3c61dba Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 5 May 2014 04:23:34 +0200
Subject: Make systemd support optional again

---
 src/fastd.c           | 8 ++++----
 src/fastd_config.h.in | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/fastd.c b/src/fastd.c
index 2ca9dd4..0d487bd 100644
--- a/src/fastd.c
+++ b/src/fastd.c
@@ -52,7 +52,7 @@
 #include <openssl/err.h>
 #endif
 
-#ifdef USE_SYSTEMD
+#ifdef ENABLE_SYSTEMD
 #include <sys/un.h>
 #endif
 
@@ -480,7 +480,7 @@ static int daemonize(void) {
 	}
 }
 
-#ifdef USE_SYSTEMD
+#ifdef ENABLE_SYSTEMD
 static void notify_systemd(const char *notify_socket) {
 	int fd;
 	struct sockaddr_un sa = {};
@@ -515,7 +515,7 @@ int main(int argc, char *argv[]) {
 	memset(&ctx, 0, sizeof(ctx));
 	int status_fd = -1;
 
-#ifdef USE_SYSTEMD
+#ifdef ENABLE_SYSTEMD
 	char *notify_socket = getenv("NOTIFY_SOCKET");
 
 	if (notify_socket) {
@@ -599,7 +599,7 @@ int main(int argc, char *argv[]) {
 
 	write_pid(getpid());
 
-#ifdef USE_SYSTEMD
+#ifdef ENABLE_SYSTEMD
 	if (notify_socket) {
 		notify_systemd(notify_socket);
 		free(notify_socket);
diff --git a/src/fastd_config.h.in b/src/fastd_config.h.in
index 8a3255f..2aace56 100644
--- a/src/fastd_config.h.in
+++ b/src/fastd_config.h.in
@@ -38,7 +38,6 @@
 #cmakedefine USE_PKTINFO
 #cmakedefine USE_PACKET_MARK
 #cmakedefine USE_MULTIAF_BIND
-#cmakedefine USE_SYSTEMD
 
 
 #cmakedefine WITH_CAPABILITIES
@@ -51,5 +50,6 @@
 
 #cmakedefine HAVE_LIBSODIUM
 #cmakedefine ENABLE_OPENSSL
+#cmakedefine ENABLE_SYSTEMD
 
 #define MAX_CONFIG_DEPTH @MAX_CONFIG_DEPTH_NUM@
-- 
cgit v1.2.3