diff --git a/configure.ac b/configure.ac index 478a72b..8895721 100644 --- a/configure.ac +++ b/configure.ac @@ -153,8 +153,6 @@ AX_CHECK_LINK_FLAG([-Wl,-z,relro,-z,now], AC_SUBST([RELRO_LDFLAGS]) PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.34.0]) -PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0]) -PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.76]) PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.16.1]) PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 05cfa4f..3628c6c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -31,7 +31,6 @@ IGNORE_HFILES= \ # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. AM_CPPFLAGS = \ - $(DBUS_GLIB_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/libupower-glib \ -I$(top_builddir)/libupower-glib \ @@ -43,7 +42,6 @@ UPOWER_GLIB_LIBS = \ GTKDOC_LIBS = \ $(UPOWER_GLIB_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(NULL) # Extra options to supply to gtkdoc-mkdb diff --git a/src/Makefile.am b/src/Makefile.am index 9f30ce7..16ae5e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(GIO_CFLAGS) \ $(GIO_UNIX_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ $(GLIB_CFLAGS) @@ -120,7 +119,6 @@ upowerd_LDADD = \ $(USB_LIBS) \ $(GIO_LIBS) \ $(GIO_UNIX_LIBS) \ - $(DBUS_GLIB_LIBS) \ $(UPOWER_LIBS) if BACKEND_TYPE_DUMMY @@ -193,7 +191,6 @@ up_self_test_LDADD = \ dummy/libuptest.la \ $(GLIB_LIBS) \ $(GIO_CFLAGS) \ - $(DBUS_GLIB_LIBS) \ $(POLKIT_LIBS) \ $(UPOWER_LIBS) diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am index 713a5e7..416b4ac 100644 --- a/src/dummy/Makefile.am +++ b/src/dummy/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -DUP_COMPILATION \ -DG_LOG_DOMAIN=\"UPower-Dummy\" \ -I$(top_srcdir)/libupower-glib \ - $(DBUS_GLIB_CFLAGS) \ $(POLKIT_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am index 53b718d..0e8d138 100644 --- a/src/freebsd/Makefile.am +++ b/src/freebsd/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -DUP_COMPILATION \ -DG_LOG_DOMAIN=\"UPower-Freebsd\" \ -I$(top_srcdir)/libupower-glib \ - $(DBUS_GLIB_CFLAGS) \ $(POLKIT_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am index 4876a57..91502a2 100644 --- a/src/linux/Makefile.am +++ b/src/linux/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libupower-glib \ $(USB_CFLAGS) \ $(GIO_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ $(POLKIT_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/openbsd/Makefile.am b/src/openbsd/Makefile.am index d3e61aa..7d05654 100644 --- a/src/openbsd/Makefile.am +++ b/src/openbsd/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -DUP_COMPILATION \ -DG_LOG_DOMAIN=\"UPower-Openbsd\" \ -I$(top_srcdir)/libupower-glib \ - $(DBUS_GLIB_CFLAGS) \ $(POLKIT_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/tools/Makefile.am b/tools/Makefile.am index dbe6724..c583fa3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -6,7 +6,6 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"UPower\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libupower-glib \ - $(DBUS_GLIB_CFLAGS) \ $(POLKIT_DBUS_CFLAGS) \ $(GLIB_CFLAGS) @@ -26,7 +25,6 @@ upower_LDFLAGS = $(PIE_LDFLAGS) upower_LDADD = \ - $(DBUS_GLIB_LIBS) \ $(UPOWER_LIBS) \ $(POLKIT_DBUS_LIBS)