From 6ece4a1a007168d4bdbaaf25ed43ab0484b4c104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Thu, 2 Dec 2021 10:42:58 -0500 Subject: [PATCH] packaging: re-enable dbus on linux For packages, jamid should be generated on Linux. GitLab: #1312 Change-Id: I164a88617cbeb5ec79aa910054d5098942ea26d2 --- packaging/rules/debian/rules | 1 - packaging/rules/rpm/jami-daemon.spec | 1 - scripts/install.sh | 4 +--- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules index 2d2e7c9f..a1fd53bb 100755 --- a/packaging/rules/debian/rules +++ b/packaging/rules/debian/rules @@ -80,7 +80,6 @@ override_dh_auto_build: ./autogen.sh && \ ./configure \ --prefix=/usr \ - --without-dbus \ --host=${HOST_ARCH} # Daemon build diff --git a/packaging/rules/rpm/jami-daemon.spec b/packaging/rules/rpm/jami-daemon.spec index ec197bf8..ec16bac0 100644 --- a/packaging/rules/rpm/jami-daemon.spec +++ b/packaging/rules/rpm/jami-daemon.spec @@ -85,7 +85,6 @@ cd %{_builddir}/ring-project/daemon && \ ./autogen.sh && \ ./configure \ --prefix=%{_prefix} \ - --without-dbus \ --libdir=%{_libdir} # Build the daemon. diff --git a/scripts/install.sh b/scripts/install.sh index ada648a6..3e9e999c 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -99,9 +99,7 @@ mkdir -p contrib/native make -j"${proc}" ) -if [[ "${enable_libwrap}" == "true" ]]; then - CONFIGURE_FLAGS+=" --without-dbus" -else +if [[ "${enable_libwrap}" != "true" ]]; then # Disable shared if requested if [[ "$OSTYPE" != "darwin"* ]]; then CONFIGURE_FLAGS+=" --disable-shared" -- GitLab