From cb5d34564fe1e552b3a652760c8f57aae4845274 Mon Sep 17 00:00:00 2001
From: Jon Schlueter <address@hidden>
Date: Mon, 12 Jan 2015 12:33:33 -0500
Subject: [PATCH] Fix broken build scons minimal=on leapfetch=off systemd=on

gpsd.c has several references that are not well guarded if

defined SYSTEMD_ENABLE
not defined CONTROL_SOCKET_ENABLE
---
 gpsd.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gpsd.c b/gpsd.c
index 53c2a3b..28471b7 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -1889,6 +1889,7 @@ int main(int argc, char *argv[])
 	exit(1);
     }
 
+#ifdef CONTROL_SOCKET_ENABLE
 #ifdef SYSTEMD_ENABLE
     sd_socket_count = sd_get_socket_count();
     if (sd_socket_count > 0 && control_socket != NULL) {
@@ -1896,7 +1897,8 @@ int main(int argc, char *argv[])
                     "control socket passed on command line ignored\n");
         control_socket = NULL;
     }
-#endif
+#endif /* SYSTEMD_ENABLE */
+#endif /* CONTROL_SOCKET_ENABLE */
 
 #if defined(CONTROL_SOCKET_ENABLE) || defined(SYSTEMD_ENABLE)
     if (
@@ -1920,14 +1922,14 @@ int main(int argc, char *argv[])
      * avoid a race condition in which hotplug scripts can try opening
      * the socket before it's created.
      */
+#ifdef CONTROL_SOCKET_ENABLE
 #ifdef SYSTEMD_ENABLE
     if (sd_socket_count > 0) {
         csock = SD_SOCKET_FDS_START;
         FD_SET(csock, &all_fds);
         adjust_max_fd(csock, true);
     }
-#endif
-#ifdef CONTROL_SOCKET_ENABLE
+#endif /* SYSTEMD_ENABLE */
     if (control_socket) {
 	(void)unlink(control_socket);
 	if (BAD_SOCKET(csock = filesock(control_socket))) {
-- 
2.0.4