diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-06-21 11:57:03 -0400 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-06-21 11:57:03 -0400 |
| commit | 1166bf58660ab483d7d743f05f5da84b56202a16 (patch) | |
| tree | 11944e5b87f518ca0e25c7721a12e7fec3c4a161 /config-scripts | |
| parent | 6ee5217845b2392402a50906b25eb242de753f6a (diff) | |
| download | cups-1166bf58660ab483d7d743f05f5da84b56202a16.tar.gz | |
Do some cleanup for the on-demand support - remove old launchd support (no
longer needed), naming/style updates, fix compiler warnings.
Diffstat (limited to 'config-scripts')
| -rw-r--r-- | config-scripts/cups-startup.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index d61bf9cbb..0ab61ec45 100644 --- 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 |