Attachment 47364 Details for Bug 37789 – [PATCH 2/5] Simplify the check for dbus-1

[patch] [PATCH 2/5] Simplify the check for dbus-1

0002-Simplify-the-check-for-dbus-1.patch (text/plain), 1.17 KB, created by Simon McVittie on 2011-05-31 07:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-05-31 07:03:42 UTC

Size: 1.17 KB

patch

obsolete

>From ef00243d3e7439b6152f77bf5cf631eb33330ba3 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 31 May 2011 14:33:18 +0100
>Subject: [PATCH 2/5] Simplify the check for dbus-1
>
>As in commit 0f782b4, omitting the action-if-found and action-if-not-found
>results in much better error messages if this mandatory dependency isn't
>found.
>
>Nothing checks HAVE_DBUS (as they shouldn't - it's mandatory!), so there's
>no point in keeping that either.
>---
> configure.ac |   12 +++---------
> 1 files changed, 3 insertions(+), 9 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index 647c6fc..011a2ba 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -353,15 +353,9 @@ XML_CFLAGS=
> 
> #### Set up final flags
> 
>-PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.2.16, have_dbus=yes, have_dbus=no)
>-
>-if test x$have_dbus = xno ; then
>-    AC_MSG_ERROR([DBus development libraries not found])
>-fi
>-AM_CONDITIONAL(HAVE_DBUS, test x$have_dbus = xyes)
>-
>-AC_SUBST(DBUS_CFLAGS)
>-AC_SUBST(DBUS_LIBS)
>+PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
>+AC_SUBST([DBUS_CFLAGS])
>+AC_SUBST([DBUS_LIBS])
> 
> DBUS_INCLUDEDIR=`pkg-config dbus-1 --variable=includedir`
> AC_SUBST(DBUS_INCLUDEDIR)
>-- 
>1.7.5.3
>

Actions: View | Splinter Review

Attachments on bug 37789: 47363 | 47364 | 47365 | 47366 | 47367

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.