summaryrefslogtreecommitdiff
path: root/config-scripts
diff options
context:
space:
mode:
authorMichael R Sweet <michaelrsweet@gmail.com>2016-06-21 11:09:37 -0400
committerGitHub <noreply@github.com>2016-06-21 11:09:37 -0400
commit6ee5217845b2392402a50906b25eb242de753f6a (patch)
treedf10153fa3b38bb63eebd7ef443f7e39442e157f /config-scripts
parentd48749331da414a3102bdbb5bc4b50f99ac02797 (diff)
parent441de8b2e031703feec2d8e7bacab0e1223e818a (diff)
Merge pull request #4825 from computersforpeace/upstart
Add Upstart socket activation support
Diffstat (limited to 'config-scripts')
-rw-r--r--config-scripts/cups-startup.m49
1 files changed, 9 insertions, 0 deletions
diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index c056a488b..d61bf9cbb 100644
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -85,6 +85,15 @@ if test x$enable_systemd != xno; then
fi
fi
+dnl Upstart is also used on Linux (e.g., Chrome OS)
+AC_ARG_ENABLE(upstart, [ --enable-upstart enable upstart support])
+if test "x$enable_upstart" = "xyes"; then
+ if test "x$have_systemd" = "xyes"; then
+ AC_MSG_ERROR(Cannot support both systemd and upstart.)
+ fi
+ AC_DEFINE(HAVE_UPSTART)
+fi
+
dnl Solaris uses smf
SMFMANIFESTDIR=""
AC_SUBST(SMFMANIFESTDIR)