diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:59:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 16:34:57 +0000 |
| commit | f2984e95740cfbb9c74574f2a1225af3411d4901 (patch) | |
| tree | 6d664743ceb58ecaa825a357c3fbefa044947719 /configure.ac | |
| parent | 67b14461bfcf4847b83b17535dde9b3efa2ed762 (diff) | |
always support packagekit if dbus is enabled
Change-Id: I8eb169d33fcb0217989b180aa0c4c0110875be32
Reviewed-on: https://gerrit.libreoffice.org/22503
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index c6a9b7d83dba..b6f6f370f01e 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,15 +1216,9 @@ AC_ARG_ENABLE(cairo-canvas, AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Determines whether to enable features that depend on dbus. - e.g. Presentation mode screensaver control, bluetooth presentation control]), + e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]), ,enable_dbus=yes) -AC_ARG_ENABLE(packagekit, - AS_HELP_STRING([--enable-packagekit], - [Determines whether to enable features using packagekit. - Right now that is auto font install]), -,) - AC_ARG_ENABLE(sdremote, AS_HELP_STRING([--disable-sdremote], [Determines whether to enable Impress remote control (i.e. the server component).]), @@ -10052,20 +10046,6 @@ AC_SUBST(ENABLE_DBUS) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -AC_MSG_CHECKING([whether to enable font install via packagekit]) -if test "$ENABLE_DBUS" = "TRUE"; then - if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then - ENABLE_PACKAGEKIT=TRUE - AC_MSG_RESULT([yes]) - else - ENABLE_PACKAGEKIT= - AC_MSG_RESULT([no]) - fi -else - AC_MSG_RESULT([no, dbus disabled.]) -fi -AC_SUBST(ENABLE_PACKAGEKIT) - AC_MSG_CHECKING([whether to enable Impress remote control]) if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([yes]) |