From: Marco Pesenti Gritti Date: Tue, 5 Jul 2005 18:39:09 +0000 (+0000) Subject: Enable dbus when available, do not require a configure option. X-Git-Tag: EVINCE_0_3_3~162 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=d2a41c2645e69a002c95a20cb69fe3fbd6f002c5;p=evince.git Enable dbus when available, do not require a configure option. 2005-07-05 Marco Pesenti Gritti * configure.ac: Enable dbus when available, do not require a configure option. --- diff --git a/ChangeLog b/ChangeLog index 61ca9c9a..bf83f093 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-05 Marco Pesenti Gritti + + * configure.ac: + + Enable dbus when available, do not require a configure + option. + 2005-07-05 Christian Persch * configure.ac: diff --git a/configure.ac b/configure.ac index ac182885..a6ee3d73 100644 --- a/configure.ac +++ b/configure.ac @@ -50,18 +50,14 @@ PKG_CHECK_MODULES(POPPLER_GLIB, poppler-glib >= $POPPLER_REQUIRED) GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) -AC_ARG_ENABLE([dbus], - AS_HELP_STRING([--enable-dbus],[Enable DBUS (default=no)]), - [enable_dbus=$enableval], - [enable_dbus=no]) +PKG_CHECK_EXISTS([dbus-glib-1 >= $DBUS_GLIB_REQUIRED], [enable_dbus=yes], + [AC_MSG_WARN("DBUS support is disabled since dbus 0.33 or higher was not found") + enable_dbus=no]) -AC_MSG_RESULT([$enable_dbus]) - -DBUS_VERSION= if test "x$enable_dbus" = "xyes" ; then + PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) AC_DEFINE([ENABLE_METADATA],[1],[Define if metadata support is enabled]) - PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED]) DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0.\([[0-9]]*\)/\1/'` AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])