From 1166bf58660ab483d7d743f05f5da84b56202a16 Mon Sep 17 00:00:00 2001
From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Tue, 21 Jun 2016 11:57:03 -0400
Subject: Do some cleanup for the on-demand support - remove old launchd
 support (no longer needed), naming/style updates, fix compiler warnings.

---
 config.h.in | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'config.h.in')

diff --git a/config.h.in b/config.h.in
index 05490a519..0323eaace 100644
--- a/config.h.in
+++ b/config.h.in
@@ -479,13 +479,19 @@
 #undef HAVE_PTHREAD_H
 
 
+/*
+ * Do we have on-demand support (launchd/systemd/upstart)?
+ */
+
+#undef HAVE_ONDEMAND
+
+
 /*
  * Do we have launchd support?
  */
 
 #undef HAVE_LAUNCH_H
 #undef HAVE_LAUNCHD
-#undef HAVE_LAUNCH_ACTIVATE_SOCKET
 
 
 /*
@@ -494,6 +500,7 @@
 
 #undef HAVE_SYSTEMD
 
+
 /*
  * Do we have upstart support?
  */
@@ -730,10 +737,4 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); }
 #  endif /* __GNUC__ || __STDC_VERSION__ */
 #endif /* !HAVE_ABS && !abs */
 
-#if defined(HAVE_LAUNCHD) || defined(HAVE_SYSTEMD) || defined(HAVE_UPSTART)
-#  define HAVE_ONDEMAND
-#else
-#  undef HAVE_ONDEMAND
-#endif
-
 #endif /* !_CUPS_CONFIG_H_ */
-- 
cgit v1.2.1