build: imply --enable-bindings-glib for --enable-dbus
PATCH v2 1/1 build: imply --enable-bindings-glib for --enable-dbus
From: Bartosz Golaszewski <[email protected]>
GLib bindings are required to build the D-Bus daemon. Enable them automatically if --enable-dbus is passed to configure.
---
v1 -> v2:
- make the changes actually work
configure.ac | 52 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 27 deletions(-)
configure.ac +25 -27
@@ -250,10 +250,35 @@ then fi fi +AC_ARG_ENABLE([dbus], + [AS_HELP_STRING([--enable-dbus], [build dbus daemon [default=no]])], + [if test "x$enableval" == xyes; then with_dbus=true; fi], + [with_dbus=false]) +AM_CONDITIONAL([WITH_DBUS], [test "x$with_dbus" = xtrue]) + AC_ARG_ENABLE([bindings-glib], [AS_HELP_STRING([--enable-bindings-glib],[enable GLib 2.0 bindings [default=no]])], [if test "x$enableval" = xyes; then with_bindings_glib=true; fi], [with_bindings_glib=false]) + +AC_DEFUN([FUNC_NOT_FOUND_DBUS], + [ERR_NOT_FOUND([$1()], [dbus daemon])]) + +if test "x$with_dbus" = xtrue +then + AC_CHECK_FUNC([daemon], [], [FUNC_NOT_FOUND_DBUS([daemon])]) + AC_CHECK_FUNC([strverscmp], [], [FUNC_NOT_FOUND_DBUS([strverscmp])]) + PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= 230]) + AC_CHECK_PROG([has_gdbus_codegen], [gdbus-codegen], [true], [false]) + if test "x$has_gdbus_codegen" = xfalse + then + AC_MSG_ERROR([gdbus-codegen not found - needed to build dbus daemon]) + fi + + # Imply GLib bindings for D-Bus + with_bindings_glib=true +fi + AM_CONDITIONAL([WITH_BINDINGS_GLIB], [test "x$with_bindings_glib" = xtrue]) if test "x$with_bindings_glib" = xtrue
@@ -280,33 +305,6 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [GOBJECT_INTROSPECTION_CHECK([0.6.2])], [AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")]) -# Depends on GLib bindings so must come after -AC_ARG_ENABLE([dbus], - [AS_HELP_STRING([--enable-dbus], [build dbus daemon [default=no]])], - [if test "x$enableval" == xyes; then with_dbus=true; fi], - [with_dbus=false]) -AM_CONDITIONAL([WITH_DBUS], [test "x$with_dbus" = xtrue]) - -AC_DEFUN([FUNC_NOT_FOUND_DBUS], - [ERR_NOT_FOUND([$1()], [dbus daemon])]) - -if test "x$with_dbus" = xtrue && test "x$with_bindings_glib" != xtrue -then - AC_MSG_ERROR([GLib bindings are required to build the dbus daemon - use --enable-bindings-glib]) -fi - -if test "x$with_dbus" = xtrue -then - AC_CHECK_FUNC([daemon], [], [FUNC_NOT_FOUND_DBUS([daemon])]) - AC_CHECK_FUNC([strverscmp], [], [FUNC_NOT_FOUND_DBUS([strverscmp])]) - PKG_CHECK_MODULES([GUDEV], [gudev-1.0 >= 230]) - AC_CHECK_PROG([has_gdbus_codegen], [gdbus-codegen], [true], [false]) - if test "x$has_gdbus_codegen" = xfalse - then - AC_MSG_ERROR([gdbus-codegen not found - needed to build dbus daemon]) - fi -fi - AC_ARG_ENABLE([systemd], [AS_HELP_STRING([--enable-systemd], [enable systemd support [default=no]])], [if test "x$enableval" == xyes; then with_systemd=true; fi],
Signature · 1 line
2.43.0
Quoted 5 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
GLib bindings are required to build the D-Bus daemon. Enable them automatically if --enable-dbus is passed to configure.
Quoted 8 lines
Fixes a5ab76da1e0a ("dbus: add the D-Bus daemon, command-line client and tests")Reported-by Douglas Silva <[email protected]>Suggested-by Kent Gibson <[email protected]>Signed-off-by Bartosz Golaszewski <[email protected]>---
v1 -> v2:
- make the changes actually work
That works for me.
Bartosz Golaszewski
AppliedFrom: Bartosz Golaszewski <[email protected]>
Quoted 4 lines · Bartosz Golaszewski
GLib bindings are required to build the D-Bus daemon. Enable them automatically if --enable-dbus is passed to configure.
Applied, thanks!
[1/1] build: imply --enable-bindings-glib for --enable-dbus
commit: d78d43bcfffdf5c96702a668a5df3a116aa4c8d7
Best regards,
Signature · 1 line
Bartosz Golaszewski <[email protected]>