picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure: restore check for glib libraries 

This is a partial revert of 2375607039. We still have code
guarded by HAVE_GLIB in tests.

v2:
- do not define the automake conditional, it wasn't used anywhere
- rename --disable-gudev to --disable-glib

v3:
- do not cause an error if the libs are not found, this is supposed
  to be an "auto" dep by default.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-06 11:03:00 -04:00
parent f96c10bdca
commit 86cebca72b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -398,6 +398,16 @@ AS_IF([test "x$enable_dbus" != "xno"], [
[AC_MSG_ERROR([*** dbus-1 support requested but libraries not found])])])
AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"])
# ------------------------------------------------------------------------------
have_glib=no
AC_ARG_ENABLE(glib, AS_HELP_STRING([--disable-glib], [disable usage of glib,gobject,gio in tests]))
AS_IF([test "x$enable_glib" != "xno"], [
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0],
[AC_DEFINE(HAVE_GLIB, 1, [Define if glib,gobject,gio are available]) have_glib=yes],
[have_glib=no])
AS_IF([test "x$have_glib" = "xno" -a "x$enable_glib" = "xyes"],
[AC_MSG_ERROR([*** glib support requested but libraries not found])])])
# ------------------------------------------------------------------------------
have_utmp=yes
AC_ARG_ENABLE([utmp], AS_HELP_STRING([--disable-utmp], [disable utmp/wtmp log handling]),
@ -1741,6 +1751,7 @@ AC_MSG_RESULT([
blkid: ${have_blkid}
libmount: ${have_libmount}
dbus: ${have_dbus}
glib: ${have_glib}
nss-myhostname: ${have_myhostname}
hwdb: ${enable_hwdb}
tpm: ${have_tpm}