Update all references to OS X to macOS.

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

diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4
index dcb13d2dd186dc7cec3117363ffa88854dd75800..4410a10ef856a9aae9ecc3a928827a4b023b1937 100644 (file)
--- a/config-scripts/cups-startup.m4
+++ b/config-scripts/cups-startup.m4
@@ -1,9 +1,7 @@
 dnl
-dnl "$Id$"
-dnl
 dnl Launch-on-demand/startup stuff for CUPS.
 dnl
-dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 2007-2015 by Apple Inc.
 dnl Copyright 1997-2005 by Easy Software Products, all rights reserved.
 dnl
 dnl These coded instructions, statements, and computer programs are the
@@ -18,7 +16,7 @@ ONDEMANDLIBS=""
 AC_SUBST(ONDEMANDFLAGS)
 AC_SUBST(ONDEMANDLIBS)
 
-dnl Launchd is used on OS X/Darwin...
+dnl Launchd is used on macOS/Darwin...
 AC_ARG_ENABLE(launchd, [  --disable-launchd       disable launchd support])
 LAUNCHD_DIR=""
 AC_SUBST(LAUNCHD_DIR)
@@ -34,8 +32,8 @@ if test x$enable_launchd != xno; then
 
        case "$uname" in
                Darwin*)
-                       # Darwin, MacOS X
-                       LAUNCHD_DIR="/System/Library/LaunchDaemons/org.cups.cupsd.plist"
+                       # Darwin, MacmacOS
+                       LAUNCHD_DIR="/System/Library/LaunchDaemons"
                        # liblaunch is already part of libSystem
                        ;;
                *)
@@ -56,17 +54,33 @@ if test x$enable_systemd != xno; then
                        AC_MSG_ERROR(Need pkg-config to enable systemd support.)
                 fi
         else
-               AC_MSG_CHECKING(for libsystemd-daemon)
-                if $PKGCONFIG --exists libsystemd-daemon; then
+               have_systemd=no
+               AC_MSG_CHECKING(for libsystemd)
+                if $PKGCONFIG --exists libsystemd; then
                         AC_MSG_RESULT(yes)
-                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+                        have_systemd=yes
+                        ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd`
+                        ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd`
+               elif $PKGCONFIG --exists libsystemd-daemon; then
+                       AC_MSG_RESULT(yes - legacy)
+                        have_systemd=yes
+                       ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
+                       ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
+
+                       if $PKGCONFIG --exists libsystemd-journal; then
+                               ONDEMANDFLAGS="$ONDEMANDFLAGS `$PKGCONFIG --cflags libsystemd-journal`"
+                               ONDEMANDLIBS="$ONDEMANDLIBS `$PKGCONFIG --libs libsystemd-journal`"
+                       fi
+                else
+                        AC_MSG_RESULT(no)
+                fi
+
+               if test $have_systemd = yes; then
                         AC_DEFINE(HAVE_SYSTEMD)
+                       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`"
                         fi
-                else
-                        AC_MSG_RESULT(no)
                 fi
         fi
 fi
@@ -166,11 +180,6 @@ if test "x$xinetd" = x; then
                         fi
                 done
         fi
-elif test "x$xinet" != xno; then
+elif test "x$xinetd" != xno; then
        XINETD="$xinetd"
 fi
-
-
-dnl
-dnl End of "$Id$".
-dnl