From 4bdf6dfacf0fa6e047ede93259eb15950ac5b107 Mon Sep 17 00:00:00 2001 From: msweet Date: Tue, 14 Jul 2015 17:39:26 +0000 Subject: [PATCH] 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 --- CHANGES.txt | 5 +++-- config-scripts/cups-common.m4 | 2 +- config-scripts/cups-startup.m4 | 20 ++++++-------------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index ac1547bbe..117126d7c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,11 +1,12 @@ -CHANGES.txt - 2.1b2 - 2015-07-02 +CHANGES.txt - 2.1rc1 - 2015-07-14 --------------------------------- -CHANGES IN CUPS V2.1b2 +CHANGES IN CUPS V2.1rc1 - Added support for 3D printers (basic types only, no built-in filters) based on PWG white paper. - Fixed bugs in the new journald support (STR #4655, STR #4658) + - Configure script changes for systemd support (STR #4669) CHANGES IN CUPS V2.1b1 diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 20fed4047..e03d03ade 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -20,7 +20,7 @@ dnl Set the name of the config header file... AC_CONFIG_HEADER(config.h) dnl Version number information... -CUPS_VERSION="2.1b2" +CUPS_VERSION="2.1rc1" CUPS_REVISION="" #if test -z "$CUPS_REVISION" -a -d .svn; then # CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`" 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 -- 2.39.2