mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
build-sys: dbus-glib is just required by gtk's systemadm
do not fail if there is no dbus-glib and we're not building the gtk frontend.
This commit is contained in:
parent
8c4dd542af
commit
010e310f29
10
configure.ac
10
configure.ac
@ -112,10 +112,6 @@ PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ])
|
|||||||
AC_SUBST(DBUS_CFLAGS)
|
AC_SUBST(DBUS_CFLAGS)
|
||||||
AC_SUBST(DBUS_LIBS)
|
AC_SUBST(DBUS_LIBS)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
|
|
||||||
AC_SUBST(DBUSGLIB_CFLAGS)
|
|
||||||
AC_SUBST(DBUSGLIB_LIBS)
|
|
||||||
|
|
||||||
have_selinux=no
|
have_selinux=no
|
||||||
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
|
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support]))
|
||||||
if test "x$enable_selinux" != "xno"; then
|
if test "x$enable_selinux" != "xno"; then
|
||||||
@ -255,6 +251,12 @@ if test "x$enable_gtk" != "xno"; then
|
|||||||
fi
|
fi
|
||||||
AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
|
AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
|
||||||
|
|
||||||
|
if test "$have_gtk" = "yes"; then
|
||||||
|
PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
|
||||||
|
AC_SUBST(DBUSGLIB_CFLAGS)
|
||||||
|
AC_SUBST(DBUSGLIB_LIBS)
|
||||||
|
fi
|
||||||
|
|
||||||
AM_PROG_VALAC([0.9])
|
AM_PROG_VALAC([0.9])
|
||||||
AC_SUBST(VAPIDIR)
|
AC_SUBST(VAPIDIR)
|
||||||
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
|
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
|
||||||
|
Loading…
Reference in New Issue
Block a user