From: Carlos Garcia Campos Date: Sat, 22 Mar 2008 15:36:31 +0000 (+0000) Subject: Add a configure option to enable/diable DBus. Patch by Rémi Cardona. X-Git-Tag: EVINCE_2_22_1~16 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=efc1202860ecf9849d517e3ca42787074b5c4d08;p=evince.git Add a configure option to enable/diable DBus. Patch by Rémi Cardona. 2008-03-22 Carlos Garcia Campos * configure.ac: Add a configure option to enable/diable DBus. Patch by Rémi Cardona. Fixes bug 521797. svn path=/trunk/; revision=2976 --- diff --git a/ChangeLog b/ChangeLog index 57a15de3..6a677b80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-22 Carlos Garcia Campos + + * configure.ac: + + Add a configure option to enable/diable DBus. Patch by Rémi + Cardona. Fixes bug 521797. + 2008-03-22 Carlos Garcia Campos * backend/pdf/ev-poppler.cc: (pdf_document_file_exporter_do_page): diff --git a/configure.ac b/configure.ac index 4b0dddad..73c81968 100644 --- a/configure.ac +++ b/configure.ac @@ -104,25 +104,31 @@ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` AC_SUBST(GLIB_GENMARSHAL) dnl ========= Check for DBUS -PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], +AC_ARG_ENABLE(dbus, + [AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])], + enable_dbus="$enableval",enable_dbus=yes) +if test "x$enable_dbus" != "xno"; then + PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED], [enable_dbus=yes],[enable_dbus=no]) -AC_SUBST([DBUS_CFLAGS]) -AC_SUBST([DBUS_LIBS]) -if test "x$enable_dbus" = "xno"; then - AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found]) -fi + if test "x$enable_dbus" = "xno"; then + AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found]) + fi -if test "x$enable_dbus" = "xyes" ; then - AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) + if test "x$enable_dbus" = "xyes" ; then + AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no]) - if test x$DBUS_BINDING_TOOL = "xno" ; then - AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings]) - fi + if test x$DBUS_BINDING_TOOL = "xno" ; then + AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings]) + fi - AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) + AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled]) + fi fi +AC_SUBST([DBUS_CFLAGS]) +AC_SUBST([DBUS_LIBS]) + LIB_CFLAGS="$LIB_CFLAGS $GNOME_CFLAGS" LIB_LIBS="$LIB_LIBS $GNOME_LIBS" AC_SUBST(LIB_CFLAGS)