From 44ee4590989f33e9ce89409879b51020a700d3c1 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 28 Aug 2015 13:29:21 +0000 Subject: [PATCH] Don't look for DBUS on OS X, either (STR #4698) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12852 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 2 +- config-scripts/cups-common.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index b61a4cc2d..a51d09d56 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,7 +12,7 @@ CHANGES IN CUPS V2.1.0 - "make check" incorrectly reported an expectation of 18 warning messages when 8 were expected (STR #4684) - The new PDF file type rule did not work (STR #4692) - - Fixed some configure script issues (STR #4694, STR #4695) + - Fixed some configure script issues (STR #4694, STR #4695, STR #4698) - Documentation updates (STR #4691, STR #4693) diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index bac0957eb..0b583cd17 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -327,7 +327,7 @@ DBUSDIR="" DBUS_NOTIFIER="" DBUS_NOTIFIERLIBS="" -if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then +if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$uname" != xDarwin; then AC_MSG_CHECKING(for DBUS) if $PKGCONFIG --exists dbus-1; then AC_MSG_RESULT(yes) -- 2.39.5