dbus: switch to meson

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 33 insertions, 44 deletions

diff --git a/rules/dbus.make b/rules/dbus.make
index 998b085bc..a1b68a5a3 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -35,52 +35,41 @@ DBUS_CONF_ENV	:= \
 	ac_cv_lib_ICE_IceConnectionNumber=no
 
 #
-# autoconf
+# meson
 #
-DBUS_CONF_TOOL	:= autoconf
+DBUS_CONF_TOOL	:= meson
 DBUS_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
-	--runstatedir=/run \
-	--enable-silent-rules \
-	--disable-developer \
-	--disable-debug \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-static \
-	--disable-ansi \
-	--disable-verbose-mode \
-	--disable-asserts \
-	--disable-checks \
-	--disable-xml-docs \
-	--disable-doxygen-docs \
-	--disable-ducktype-docs \
-	--$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \
-	--disable-apparmor \
-	--disable-libaudit \
-	--enable-inotify \
-	--disable-kqueue \
-	--disable-console-owner-file \
-	--disable-launchd \
-	--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-systemd \
-	--enable-traditional-activation \
-	--disable-embedded-tests \
-	--disable-modular-tests \
-	--disable-tests \
-	--disable-installed-tests \
-	--disable-code-coverage \
-	--enable-epoll \
-	--$(call ptx/endis, PTXCONF_DBUS_X)-x11-autolaunch \
-	--disable-compile-warnings \
-	--disable-Werror \
-	--disable-qt-help \
-	--disable-relocation \
-	--disable-stats \
-	--$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)-user-session \
-	--with-system-socket=/run/dbus/system_bus_socket \
-	--with-dbus-user=messagebus \
-	--without-valgrind \
-	--with-x=$(call ptx/ifdef,PTXCONF_DBUS_X,auto,no) \
-	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--with-systemduserunitdir=/usr/lib/systemd/user
+	$(CROSS_MESON_USR) \
+	-Dapparmor=disabled \
+	-Dasserts=false \
+	-Dchecks=false \
+	-Dcontainers=false \
+	-Ddbus_user=messagebus \
+	-Ddoxygen_docs=disabled \
+	-Dducktype_docs=disabled \
+	-Dembedded_tests=false \
+	-Depoll=enabled \
+	-Dinotify=enabled \
+	-Dinstalled_tests=false \
+	-Dkqueue=disabled \
+	-Dlaunchd=disabled \
+	-Dlibaudit=disabled \
+	-Dmessage_bus=true \
+	-Dmodular_tests=disabled \
+	-Dqt_help=disabled \
+	-Drelocation=disabled \
+	-Dselinux=$(call ptx/endis, PTXCONF_DBUS_SELINUX)d \
+	-Dstats=false \
+	-Dsystemd=$(call ptx/endis, PTXCONF_DBUS_SYSTEMD)d \
+	-Dsystemd_system_unitdir=/usr/lib/systemd/system \
+	-Dsystemd_user_unitdir=/usr/lib/systemd/user \
+	-Dtools=true \
+	-Dtraditional_activation=true \
+	-Duser_session=$(call ptx/truefalse, PTXCONF_DBUS_SYSTEMD) \
+	-Dvalgrind=disabled \
+	-Dverbose_mode=false \
+	-Dx11_autolaunch=$(call ptx/endis, PTXCONF_DBUS_X)d \
+	-Dxml_docs=disabled
 
 # ----------------------------------------------------------------------------
 # Target-Install