diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2017-12-20 11:48:22 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2017-12-20 11:48:22 +1300 |
| commit | edb7395bd742a35c70acc1ba5bfd418df71bcacb (patch) | |
| tree | 75134b396a697ef7fe5729735c2cca95bb801df5 | |
| parent | b6a80f88886076d36404caffd7ec0810a56070b7 (diff) | |
| download | accountsservice-edb7395bd742a35c70acc1ba5bfd418df71bcacb.tar.gz | |
Require glib 2.44 for g_auto
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | doc/libaccountsservice/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c131da4..f25d72b 100644 --- a/configure.ac +++ b/configure.ac @@ -25,17 +25,11 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.37.3 gio-unix-2.0) -PKG_CHECK_MODULES(POLKIT, gio-unix-2.0 polkit-gobject-1) +PKG_CHECK_MODULES(LIBACCOUNTSSERVICE, glib-2.0 >= 2.44 gio-2.0 >= 2.37.3 gio-unix-2.0) +PKG_CHECK_MODULES(ACCOUNTS_DAEMON, glib-2.0 >= 2.44 gio-unix-2.0 polkit-gobject-1) AM_MAINTAINER_MODE([enable]) -# client library dependencies -LIBACCOUNTSSERVICE_LIBS="$GIO_LIBS" -AC_SUBST(LIBACCOUNTSSERVICE_LIBS) -LIBACCOUNTSSERVICE_CFLAGS="$GIO_CFLAGS" -AC_SUBST(LIBACCOUNTSSERVICE_CFLAGS) - GOBJECT_INTROSPECTION_CHECK([0.9.12]) dnl --------------------------------------------------------------------------- diff --git a/doc/libaccountsservice/Makefile.am b/doc/libaccountsservice/Makefile.am index 8f5486b..5006c37 100644 --- a/doc/libaccountsservice/Makefile.am +++ b/doc/libaccountsservice/Makefile.am @@ -20,11 +20,11 @@ IGNORE_HFILES= \ GTKDOC_CFLAGS= \ -I$(top_srcdir)/src/libaccountsservice \ - $(GIO_CFLAGS) + $(LIBACCOUNTSSERVICE_CFLAGS) GTKDOC_LIBS= \ $(top_builddir)/src/libaccountsservice/libaccountsservice.la \ - $(GIO_LIBS) + $(LIBACCOUNTSSERVICE_LIBS) include $(top_srcdir)/gtk-doc.make diff --git a/src/Makefile.am b/src/Makefile.am index 7a28beb..f53e3e1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ -DUSERDIR=\"$(localstatedir)/lib/AccountsService/users\" \ -I$(srcdir) \ -I$(builddir) \ - $(POLKIT_CFLAGS) \ + $(ACCOUNTS_DAEMON_CFLAGS) \ $(WARN_CFLAGS) noinst_LTLIBRARIES = libaccounts-generated.la @@ -47,7 +47,7 @@ accounts_daemon_SOURCES = \ accounts_daemon_LDADD = \ libaccounts-generated.la \ - $(POLKIT_LIBS) + $(ACCOUNTS_DAEMON_LIBS) EXTRA_DIST = \ fgetpwent.c \ |