Do some cleanup for the on-demand support - remove old launchd support (no

[thirdparty/cups.git] / config-scripts / cups-startup.m4

diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index d61bf9cbbf3c63cd0bdbcaa106255e015d5ce4dc..0ab61ec452acdb5107c91ff5c06cd3098423c1ce 100644 (file)
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -22,12 +22,9 @@ LAUNCHD_DIR=""
 AC_SUBST(LAUNCHD_DIR)
 
 if test x$enable_launchd != xno; then
-       AC_CHECK_FUNC(launch_msg, AC_DEFINE(HAVE_LAUNCHD))
-       if test $uversion -ge 140; then
-               AC_CHECK_FUNC(launch_activate_socket, [
-                       AC_DEFINE(HAVE_LAUNCHD)
-                       AC_DEFINE(HAVE_LAUNCH_ACTIVATE_SOCKET)])
-       fi
+       AC_CHECK_FUNC(launch_activate_socket, [
+               AC_DEFINE(HAVE_LAUNCHD)
+               AC_DEFINE(HAVE_ONDEMAND)])
        AC_CHECK_HEADER(launch.h, AC_DEFINE(HAVE_LAUNCH_H))
 
        case "$uname" in
@@ -77,6 +74,7 @@ if test x$enable_systemd != xno; then
 
                if test $have_systemd = yes; then
                         AC_DEFINE(HAVE_SYSTEMD)
+                        AC_DEFINE(HAVE_ONDEMAND)
                        AC_CHECK_HEADER(systemd/sd-journal.h,AC_DEFINE(HAVE_SYSTEMD_SD_JOURNAL_H))
                        if test "x$SYSTEMD_DIR" = x; then
                                SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`"
@@ -92,6 +90,7 @@ if test "x$enable_upstart" = "xyes"; then
                AC_MSG_ERROR(Cannot support both systemd and upstart.)
        fi
        AC_DEFINE(HAVE_UPSTART)
+       AC_DEFINE(HAVE_ONDEMAND)
 fi
 
 dnl Solaris uses smf