diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-07-14 17:39:26 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-07-14 17:39:26 +0000 |
| commit | 4bdf6dfacf0fa6e047ede93259eb15950ac5b107 (patch) | |
| tree | 03e6e27d84b8077098e16776bc3ab52bfc74ca1c /config-scripts/cups-startup.m4 | |
| parent | 845cd487598112d8551b285e0a9441f3e7f0220f (diff) | |
Next release will be CUPS 2.1rc1...
Just look for libsystemd for all systemd support (STR #4669)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12784 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'config-scripts/cups-startup.m4')
| -rw-r--r-- | config-scripts/cups-startup.m4 | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 8089d0859..2aeeac16e 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -3,7 +3,7 @@ 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 @@ -56,27 +56,19 @@ 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 + AC_MSG_CHECKING(for libsystemd) + if $PKGCONFIG --exists libsystemd; then AC_MSG_RESULT(yes) - ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` - ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon` + ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd` + ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd` 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 - AC_MSG_CHECKING(for libsystemd-journal) - if $PKGCONFIG --exists libsystemd-journal; then - AC_MSG_RESULT(yes) - ONDEMANDFLAGS="$ONDEMANDFLAGS `$PKGCONFIG --cflags libsystemd-journal`" - ONDEMANDLIBS="$ONDEMANDLIBS `$PKGCONFIG --libs libsystemd-journal`" - AC_CHECK_HEADER(systemd/sd-journal.h,AC_DEFINE(HAVE_SYSTEMD_SD_JOURNAL_H)) - else - AC_MSG_RESULT(no) - fi fi fi |