build: Remove autotools

To avoid the burden of maintaining multiple build systems, this
patch removes autotools support.

GitLab CI configuration has also been updated to use meson.

14 files changed, 6 insertions, 836 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07184a6..eafa52c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,15 @@ build-ubuntu:
   image: ubuntu:rolling
   before_script:
     - apt-get update
-    - apt-get install -q -y --no-install-recommends gobject-introspection gtk-doc-tools intltool libglib2.0-dev libpolkit-gobject-1-dev libsystemd-dev libtool
+    - apt-get install -q -y --no-install-recommends meson ninja-build gobject-introspection gtk-doc-tools gettext libglib2.0-dev libpolkit-gobject-1-dev libsystemd-dev libdbus-1-dev
   script:
-    - ./autogen.sh --enable-gtk-doc --with-systemdsystemunitdir=/lib/systemd/system
-    - make
+    - meson -Dgtk_doc=true _build
+    - ninja -C _build all
 
 build-fedora:
   image: fedora:latest
   before_script:
-    - dnf install -y gcc gobject-introspection-devel glib-devel gtk-doc intltool make polkit-devel redhat-rpm-config systemd-devel
+    - dnf install -y gcc meson ninja-build gobject-introspection-devel glib-devel gtk-doc gettext-devel make polkit-devel redhat-rpm-config systemd-devel dbus-devel
   script:
-    - ./autogen.sh --enable-gtk-doc
-    - make
+    - meson -Dgtk_doc=true _build
+    - ninja -C _build all
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 6904930..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS = src data po doc
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-EXTRA_DIST = gtk-doc.make README.md
-
-AM_DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc \
-	--enable-docbook-docs \
-	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 43724c6..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-GTKDOCIZE=$(which gtkdocize 2>/dev/null)
-if test -z $GTKDOCIZE; then
-        echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."
-        rm -f gtk-doc.make
-        cat > gtk-doc.make <<EOF
-EXTRA_DIST =
-CLEANFILES =
-EOF
-else
-        (cd $(dirname $0) && gtkdocize) || exit $?
-fi
-
-ACLOCAL="aclocal $ACLOCAL_FLAGS"
-export ACLOCAL
-
-(cd $(dirname $0);
- autoreconf --install --force --symlink --verbose &&
- autoreconf --force --verbose)
-
-test -n "$NOCONFIGURE" || "$(dirname $0)/configure" "$@"
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 6699b63..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,392 +0,0 @@
-AC_INIT([AccountsService],[0.6.50])
-AM_INIT_AUTOMAKE([1.11.2 no-dist-gzip dist-xz tar-ustar foreign])
-
-# Support silent build rules, requires at least automake-1.11. Enable
-# by either passing --enable-silent-rules to configure or passing V=0
-# to make
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_USE_SYSTEM_EXTENSIONS
-AC_PROG_CC
-PKG_PROG_PKG_CONFIG
-
-# i18n
-AX_REQUIRE_DEFINED([AM_GNU_GETTEXT_VERSION])
-AM_GNU_GETTEXT_VERSION([0.19.8])
-
-AX_REQUIRE_DEFINED([AM_GNU_GETTEXT])
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE=accountsservice
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
-                   [the gettext translation domain])
-
-LT_INIT
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
-
-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])
-
-GOBJECT_INTROSPECTION_CHECK([0.9.12])
-
-dnl ---------------------------------------------------------------------------
-dnl - Core configuration
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_ENABLE(admin-group,
-        [AS_HELP_STRING([--enable-admin-group],[Set group for administrative accounts @<:@default=auto@:>@])],
-        ,enable_admin_group=auto)
-AS_IF([test x$enable_admin_group = xauto], [
-  AC_CHECK_FILE(/etc/redhat-release, enable_admin_group=wheel)
-  AC_CHECK_FILE(/etc/debian_version, enable_admin_group=sudo)
-  AS_IF([test x$enable_admin_group = xauto], [
-    enable_admin_group=wheel
-  ])
-])
-AC_DEFINE_UNQUOTED([ADMIN_GROUP], ["$enable_admin_group"], [Define to the group for administrator users])
-
-AC_ARG_WITH(extra-admin-groups,
-        [AS_HELP_STRING([--with-extra-admin-groups],[Comma-separated list of extra groups that administrator users are part of])],
-        ,with_extra_admin_groups="")
-AC_DEFINE_UNQUOTED([EXTRA_ADMIN_GROUPS], ["$with_extra_admin_groups"], [Define to the list of extra groups administrator users are part of])
-
-AC_ARG_ENABLE(user-heuristics,
-        [AS_HELP_STRING([--enable-user-heuristics],[Enable heuristics for guessing system vs. human users in the range 500-minimum-uid])],
-        [if test "$enableval" = yes; then
-           AC_DEFINE([ENABLE_USER_HEURISTICS], , [System vs. human user heuristics enabled])
-        fi])
-
-AC_ARG_WITH(minimum-uid,
-        [AS_HELP_STRING([--with-minimum-uid],[Set minimum uid for human users])],
-        ,with_minimum_uid=1000)
-
-AC_DEFINE_UNQUOTED([MINIMUM_UID], $with_minimum_uid, [Define to the minumum UID of human users])
-
-dnl ---------------------------------------------------------------------------
-dnl - coverage
-dnl ---------------------------------------------------------------------------
-
-AC_MSG_CHECKING([whether to build with gcov testing])
-AC_ARG_ENABLE([coverage],
-              AS_HELP_STRING([--enable-coverage],
-                             [Whether to enable gcov code coverage]),
-              [], [enable_coverage=no])
-AC_MSG_RESULT([$enable_coverage])
-
-if test "$enable_coverage" = "yes"; then
-	if test "$GCC" != "yes"; then
-		AC_MSG_ERROR(Coverage testing requires GCC)
-	fi
-	CFLAGS="$CFLAGS -O0 -g --coverage"
-fi
-
-AM_CONDITIONAL([WITH_COVERAGE], [test "$enable_coverage" = "yes"])
-
-dnl ---------------------------------------------------------------------------
-dnl - Warnings
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_ENABLE(more-warnings,
-              AS_HELP_STRING([--enable-more-warnings],
-                             [Maximum compiler warnings]),
-              set_more_warnings="$enableval",[
-              if test -d $srcdir/.git; then
-                set_more_warnings=yes
-              else
-                set_more_warnings=no
-              fi])
-
-AC_MSG_CHECKING(for more warnings)
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-  AC_MSG_RESULT(yes)
-  MAYBE_WARN="\
-   -Wall -Wextra  \
-   -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-   -Wwrite-strings -Wnested-externs -Wpointer-arith \
-   -Wswitch-enum -Wstrict-aliasing=2 -Winit-self -Wunsafe-loop-optimizations \
-   -Wno-missing-field-initializers -Wno-unused-parameter \
-   -Wcast-align -Wsign-compare"
-elif test "$GCC" = "yes"; then
-  AC_MSG_RESULT(no)
-  MAYBE_WARN="-Wall -Wno-sign-compare -Wno-deprecated-declarations"
-else
-  AC_MSG_RESULT(no)
-fi
-
-# invalidate cached value if MAYBE_WARN has changed
-if test "x$accountsservice_cv_warn_maybe" != "x$MAYBE_WARN"; then
-  unset accountsservice_cv_warn_cflags
-fi
-
-AC_DEFUN([ACCOUNTSSERVICE_CC_TRY_FLAG], [
-  AC_MSG_CHECKING([whether $CC supports $1])
-
-  accountsservice_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-                    [accountsservice_cc_flag=yes],
-                    [accountsservice_cc_flag=no])
-  CFLAGS="$accountsservice_save_CFLAGS"
-
-  if test "x$accountsservice_cc_flag" = "xyes"; then
-    ifelse([$2], , :, [$2])
-  else
-    ifelse([$3], , :, [$3])
-  fi
-  AC_MSG_RESULT([$accountsservice_cc_flag])
-])
-
-AC_CACHE_CHECK([for supported warning flags], accountsservice_cv_warn_cflags, [
-  echo
-  WARN_CFLAGS=""
-
-  # Some warning options are not supported by all versions of
-  # gcc, so test all desired options against the current
-  # compiler.
-  #
-  # Note that there are some order dependencies
-  # here. Specifically, an option that disables a warning will
-  # have no net effect if a later option then enables that
-  # warnings, (perhaps implicitly). So we put some grouped
-  # options (-Wall and -Wextra) up front and the -Wno options
-  # last.
-
-  for W in $MAYBE_WARN; do
-    ACCOUNTSSERVICE_CC_TRY_FLAG([$W], [WARN_CFLAGS="$WARN_CFLAGS $W"])
-  done
-
-  accountsservice_cv_warn_cflags=$WARN_CFLAGS
-  accountsservice_cv_warn_maybe=$MAYBE_WARN
-
-  AC_MSG_CHECKING([which warning flags were supported])
-])
-
-WARN_CFLAGS="$accountsservice_cv_warn_cflags"
-
-if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
-  # Only add this when optimizing is enabled (default)
-  AC_MSG_CHECKING([whether optimization is enabled])
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if __OPTIMIZE__ == 0
-                                       #error No optimization
-                                       #endif
-                                     ]], [[]])],
-                    [has_optimization=yes],
-                    [has_optimization=no])
-  if test $has_optimization = yes; then
-    WARN_CFLAGS="$WARN_CFLAGS -Wp,-D_FORTIFY_SOURCE=2"
-  fi
-  AC_MSG_RESULT($has_optimization)
-fi
-
-AC_SUBST(WARN_CFLAGS)
-
-AC_CHECK_HEADERS([paths.h shadow.h utmpx.h])
-
-AC_CHECK_FUNCS([fgetpwent setutxdb])
-
-wtmpx_found="no"
-AC_CHECK_DECLS([WTMPX_FILENAME], [wtmpx_found="WTMPX_FILENAME"],
-               [], [AC_INCLUDES_DEFAULT
-#include <utmpx.h>
-               ])
-if test "$wtmpx_found" = "no" ; then
-  AC_CHECK_DECLS([_PATH_WTMPX], [wtmpx_found="_PATH_WTMPX"],
-                 [], [AC_INCLUDES_DEFAULT
-#ifdef HAVE_PATHS_H
-#include <paths.h>
-#endif
-#ifdef HAVE_UTMPX_H
-#include <utmpx.h>
-#endif
-                 ])
-  if test "$wtmpx_found" = "no" ; then
-    AC_CHECK_FILE([/var/log/utx.log], [wtmpx_found='"/var/log/utx.log"'])
-    if test "$wtmpx_found" = "no" ; then
-      AC_MSG_FAILURE([Do not know which filename to watch for wtmp changes])
-    fi
-  fi
-fi
-AC_DEFINE_UNQUOTED([PATH_WTMP], [$wtmpx_found], [Path to wtmpx file])
-
-AC_CHECK_LIB(c, getusershell, have_getusershell=yes, have_getusershell=no)
-if test x$have_getusershell = xyes; then
-  AC_DEFINE(HAVE_GETUSERSHELL, 1, [Define if getusershell() is available])
-fi
-
-dnl ---------------------------------------------------------------------------
-dnl - gtk-doc Documentation
-dnl ---------------------------------------------------------------------------
-
-m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-],[
-AM_CONDITIONAL([ENABLE_GTK_DOC],[false])
-])
-
-dnl ---------------------------------------------------------------------------
-dnl - DocBook Documentation
-dnl ---------------------------------------------------------------------------
-
-AC_ARG_ENABLE(docbook-docs,
-        [AS_HELP_STRING([--enable-docbook-docs],[build documentation (requires xmlto)])],
-        enable_docbook_docs=$enableval,enable_docbook_docs=no)
-AC_PATH_PROG(XMLTO, xmlto, no)
-AC_MSG_CHECKING([whether to build DocBook documentation])
-if test x$XMLTO = xno ; then
-        have_docbook=no
-else
-        have_docbook=yes
-fi
-if test x$enable_docbook_docs = xauto ; then
-        if test x$have_docbook = xno ; then
-                enable_docbook_docs=no
-        else
-                enable_docbook_docs=yes
-        fi
-fi
-if test x$enable_docbook_docs = xyes; then
-        if test x$have_docbook = xno; then
-                AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found])
-        fi
-fi
-AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
-AC_MSG_RESULT(yes)
-AC_ARG_VAR([XMLTO],[Define/override the 'xmlto' location.])
-AC_ARG_VAR([XMLTO_FLAGS],[Define/override 'xmlto' options, like '--skip-validation'.])
-
-dnl ---------------------------------------------------------------------------
-dnl Check for xsltproc
-dnl ---------------------------------------------------------------------------
-AC_PATH_PROG([XSLTPROC], [xsltproc])
-
-# systemd or elogind
-
-have_systemd=no
-
-AC_MSG_CHECKING([whether to use systemd])
-
-AC_ARG_ENABLE([systemd],
-              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-              [enable_systemd=$enableval],
-              [enable_systemd=auto])
-
-AC_MSG_RESULT($enable_systemd)
-
-if test x$enable_systemd != xno; then
-        PKG_CHECK_MODULES(SYSTEMD, [libsystemd >= 186],
-                                   [have_systemd=yes])
-fi
-
-if test x$enable_systemd = xauto ; then
-        if test x$have_systemd = xno ; then
-                enable_systemd=no
-        else
-                enable_systemd=yes
-        fi
-fi
-
-have_elogind=no
-
-AC_MSG_CHECKING([whether to use elogind])
-
-AC_ARG_ENABLE([elogind],
-              AS_HELP_STRING([--enable-elogind], [Use elogind]),
-              [enable_elogind=$enableval],
-              [enable_elogind=no])
-
-AC_MSG_RESULT($enable_elogind)
-
-if test x$enable_systemd = xyes; then
-        if test x$have_systemd = xno; then
-                AC_MSG_ERROR([Systemd support explicitly requested, but libsystemd not found])
-        fi
-
-        dnl Requesting to use the elogind session tracker makes no sense where
-        dnl systemd-login is (or might be) running.
-        if test x$enable_elogind = xyes; then
-                AC_MSG_WARN([elogind support requested, but systemd was found.])
-                AC_MSG_ERROR([Disable either elogind or systemd support.])
-        fi
-
-        AC_SUBST(SYSTEMD_CFLAGS)
-        AC_SUBST(SYSTEMD_LIBS)
-
-        LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $SYSTEMD_LIBS"
-        LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $SYSTEMD_CFLAGS"
-
-        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used])
-fi
-
-if test "x$enable_elogind" != "xno"; then
-        PKG_CHECK_MODULES(ELOGIND, [libelogind >= 229.4],
-                                   [have_elogind=yes])
-
-        if test "x$have_elogind" != "xyes"; then
-                AC_MSG_ERROR([elogind support requested, but libelogind not found])
-        else
-                AC_SUBST(ELOGIND_CFLAGS)
-                AC_SUBST(ELOGIND_LIBS)
-
-                LIBACCOUNTSSERVICE_LIBS="$LIBACCOUNTSSERVICE_LIBS $ELOGIND_LIBS"
-                LIBACCOUNTSSERVICE_CFLAGS="$LIBACCOUNTSSERVICE_CFLAGS $ELOGIND_CFLAGS"
-        fi
-fi
-
-if test "x${have_systemd}" != "xno" -o "x${have_elogind}" != "xno" ; then
-        AC_DEFINE(WITH_SYSTEMD, 1, [Define to enable systemd support])
-fi
-
-AC_ARG_WITH([systemdsystemunitdir],
-        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-        [],
-        [with_systemdsystemunitdir=$have_systemd])
-if test "x$with_systemdsystemunitdir" = "xyes"; then
-    with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
-fi
-if test "x$with_systemdsystemunitdir" != "xno"; then
-    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-fi
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ])
-
-AC_ARG_WITH(gdmconffile,
-            AS_HELP_STRING([--with-gdmconffile=FILE], [GDM configuration file, default=/etc/gdm/custom.conf]),
-            gdmconffile=${withval}, gdmconffile=/etc/gdm/custom.conf)
-AC_DEFINE_UNQUOTED([PATH_GDM_CUSTOM], ["$gdmconffile"], [GDM configuration file])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([
-Makefile
-po/Makefile.in
-data/Makefile
-src/Makefile
-src/libaccountsservice/Makefile
-src/libaccountsservice/accountsservice.pc
-doc/Makefile
-doc/dbus/Makefile
-doc/dbus/AccountsService.xml
-doc/libaccountsservice/Makefile
-])
-AC_OUTPUT
-
-echo
-AC_MSG_NOTICE([accountsservice was configured with the following options:])
-if test "x$enable_docbook_docs" = "xyes"; then
-        AC_MSG_NOTICE([** DocBook documentation build enabled])
-else
-        AC_MSG_NOTICE([** DocBook documentation build disabled])
-fi
-        AC_MSG_NOTICE([** Administrator group: $enable_admin_group])
-        AC_MSG_NOTICE([** Extra administrator groups: $with_extra_admin_groups])
-        AC_MSG_NOTICE([** GDM configuration: $gdmconffile])
-echo
-
-
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index b8cc528..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-
-dbusifdir   = $(datadir)/dbus-1/interfaces
-dbusif_DATA = \
-	org.freedesktop.Accounts.xml 		\
-	org.freedesktop.Accounts.User.xml
-
-dbusconfdir   = $(sysconfdir)/dbus-1/system.d
-dbusconf_DATA = org.freedesktop.Accounts.conf
-
-servicedir       = $(datadir)/dbus-1/system-services
-service_in_files = org.freedesktop.Accounts.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< >$@
-
-policydir       = $(datadir)/polkit-1/actions
-policy_in_files = org.freedesktop.accounts.policy.in
-policy_DATA     = $(policy_in_files:.policy.in=.policy)
-
-org.freedesktop.accounts.policy: org.freedesktop.accounts.policy.in
-	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-if HAVE_SYSTEMD
-systemdsystemunit_DATA = \
-	accounts-daemon.service
-
-accounts-daemon.service: accounts-daemon.service.in
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< >$@
-
-endif
-
-EXTRA_DIST = 			\
-	$(dbusif_DATA)		\
-	$(dbusconf_DATA)	\
-	$(service_in_files)	\
-	$(policy_in_files)      \
-	accounts-daemon.service.in
-
-DISTCLEANFILES = 		\
-	$(service_DATA)		\
-	$(policy_DATA)
-
-CLEANFILES = \
-	accounts-daemon.service
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 6af2fc5..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = dbus libaccountsservice
diff --git a/doc/dbus/Makefile.am b/doc/dbus/Makefile.am
deleted file mode 100644
index 70963c0..0000000
--- a/doc/dbus/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-NULL =
-
-SPEC_XML_FILES =			\
-	AccountsService.xml		\
-	org.freedesktop.Accounts.ref.xml	\
-	org.freedesktop.Accounts.User.ref.xml		\
-	$(NULL)
-
-if DOCBOOK_DOCS_ENABLED
-
-htmldocdir = $(docdir)/spec
-htmldoc_DATA = AccountsService.html
-
-AccountsService.html : $(SPEC_XML_FILES)
-	$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl AccountsService.xml
-
-endif # DOCBOOK_DOCS_ENABLED
-
-org.freedesktop.Accounts.ref.xml : $(top_srcdir)/data/org.freedesktop.Accounts.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-org.freedesktop.Accounts.User.ref.xml : $(top_srcdir)/data/org.freedesktop.Accounts.User.xml spec-to-docbook.xsl
-	$(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
-
-EXTRA_DIST =				\
-	spec-to-docbook.xsl		\
-	AccountsService.xml.in		\
-	config.xsl			\
-	docbook.css			\
-	dbus-introspect-docs.dtd	\
-	$(SPEC_XML_FILES)
-	$(NULL)
-
-MAINTAINERCLEANFILES =		\
-	*~			\
-	Makefile.in		\
-	$(NULL)
-
-clean-local:
-	rm -f *~ *.ref.xml
-	rm -f AccountsService.html
-
-check-local:
-	xmllint --noout --noent --valid AccountsService.xml
diff --git a/doc/libaccountsservice/Makefile.am b/doc/libaccountsservice/Makefile.am
deleted file mode 100644
index 5006c37..0000000
--- a/doc/libaccountsservice/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-AUTOMAKE_OPTIONS=1.6
-
-DOC_MODULE=libaccountsservice
-
-DOC_MAIN_SGML_FILE=libaccountsservice-docs.xml
-
-DOC_SOURCE_DIR=$(top_srcdir)/src/libaccountsservice
-
-MKBD_OPTIONS=--xml-mode --output-format=xml --name-space=act
-
-HFILE_GLOB=$(top_srcdir)/src/libaccountsservice/*.h
-
-IGNORE_HFILES= \
-	accounts-generated.h \
-	accounts-user-generated.h \
-	ck-manager-generated.h \
-	ck-seat-generated.h \
-	ck-session-generated.h \
-	act-user-enum-types.h
-
-GTKDOC_CFLAGS= \
-	-I$(top_srcdir)/src/libaccountsservice \
-	$(LIBACCOUNTSSERVICE_CFLAGS)
-
-GTKDOC_LIBS= \
-	$(top_builddir)/src/libaccountsservice/libaccountsservice.la \
-	$(LIBACCOUNTSSERVICE_LIBS)
-
-include $(top_srcdir)/gtk-doc.make
-
-CLEANFILES += \
-	*-decl*.txt \
-	$(NULL)
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/m4/.gitignore
+++ /dev/null
diff --git a/po/Makevars b/po/Makevars
deleted file mode 100644
index 38dea9a..0000000
--- a/po/Makevars
+++ /dev/null
@@ -1,71 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Red Hat, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
-
-# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
-# context.  Possible values are "yes" and "no".  Set this to yes if the
-# package uses functions taking also a message context, like pgettext(), or
-# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
-USE_MSGCTXT = yes
-
-# These options get passed to msgmerge.
-# Useful options are in particular:
-#   --previous            to keep previous msgids of translated messages,
-#   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS =
-
-# These options get passed to msginit.
-# If you want to disable line wrapping when writing PO files, add
-# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
-# MSGINIT_OPTIONS.
-MSGINIT_OPTIONS =
-
-# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
-# has changed.  Possible values are "yes" and "no".  Set this to no if
-# the POT file is checked in the repository and the version control
-# program ignores timestamps.
-PO_DEPENDS_ON_POT = no
-
-# This tells whether or not to forcibly update $(DOMAIN).pot and
-# regenerate PO files on "make dist".  Possible values are "yes" and
-# "no".  Set this to no if the POT file and PO files are maintained
-# externally.
-DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index f53e3e1..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-NULL =
-BUILT_SOURCES =
-SUBDIRS = . libaccountsservice
-INCLUDES = 			\
-	-DLOCALSTATEDIR=\""$(localstatedir)"\" \
-	-DDATADIR=\""$(datadir)"\" \
-	-DICONDIR=\"$(localstatedir)/lib/AccountsService/icons\" \
-	-DUSERDIR=\"$(localstatedir)/lib/AccountsService/users\" \
-	-I$(srcdir)		\
-	-I$(builddir)		\
-	$(ACCOUNTS_DAEMON_CFLAGS)	\
-	$(WARN_CFLAGS)
-
-noinst_LTLIBRARIES = libaccounts-generated.la
-
-libaccounts_generated_la_SOURCES = \
-	accounts-generated.c		\
-	accounts-generated.h		\
-	accounts-user-generated.c	\
-	accounts-user-generated.h	\
-	$(NULL)
-BUILT_SOURCES += $(libaccounts_generated_la_SOURCES)
-
-accounts-generated.c accounts-generated.h: $(top_srcdir)/data/org.freedesktop.Accounts.xml Makefile
-	gdbus-codegen --generate-c-code accounts-generated --c-namespace Accounts --interface-prefix=org.freedesktop. $(top_srcdir)/data/org.freedesktop.Accounts.xml
-
-accounts-user-generated.c accounts-user-generated.h: $(top_srcdir)/data/org.freedesktop.Accounts.User.xml Makefile
-	gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml
-
-libexec_PROGRAMS = accounts-daemon
-
-accounts_daemon_SOURCES = 	\
-	$(enums_h_sources)	\
-	types.h			\
-	daemon.h		\
-	daemon.c		\
-	extensions.c		\
-	user-classify.h		\
-	user-classify.c		\
-	user.h			\
-	user.c			\
-	util.h			\
-	util.c			\
-	wtmp-helper.h		\
-	wtmp-helper.c		\
-	main.c
-
-accounts_daemon_LDADD = 	\
-	libaccounts-generated.la	\
-	$(ACCOUNTS_DAEMON_LIBS)
-
-EXTRA_DIST = \
-	fgetpwent.c	\
-	$(NULL)
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	*.gcda \
-	*.gcno \
-	$(NULL)
-
-install-data-hook:
-	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/users"
-	$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/AccountsService/icons"
diff --git a/src/libaccountsservice/Makefile.am b/src/libaccountsservice/Makefile.am
deleted file mode 100644
index 408d91f..0000000
--- a/src/libaccountsservice/Makefile.am
+++ /dev/null
@@ -1,136 +0,0 @@
-END_OF_LIST =
-
-BUILT_SOURCES = $(END_OF_LIST)
-CLEANFILES = \
-	*.gcda \
-	*.gcno \
-	$(END_OF_LIST)
-
-AM_CPPFLAGS = \
-        -I.                                                                   \
-        -I..                                                                  \
-        -DG_LOG_DOMAIN=\"AccountsService\"                                    \
-        $(END_OF_LIST)
-
-lib_LTLIBRARIES =                                                             \
-        libaccountsservice.la                                                 \
-        $(END_OF_LIST)
-
-act-user-enum-types.h: act-user.h act-user-manager.h
-	$(AM_V_GEN) (cd $(srcdir) && \
-	         glib-mkenums \
-	          --fhead "#ifndef __ACT_USER_ENUM_TYPES_H__\n#define __ACT_USER_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-	          --fprod "/* enumerations from \"@filename@\" */\n" \
-	          --vhead "GType @enum_name@_get_type (void);\n#define ACT_USER_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"    \
-	          --ftail "G_END_DECLS\n\n#endif /* __ACT_USER_ENUM_TYPES_H__ */" \
-	          $(^F) ) > $@
-
-act-user-enum-types.c: act-user.h act-user-manager.h act-user-enum-types.h
-	$(AM_V_GEN) (cd $(srcdir) && \
-	         glib-mkenums \
-	          --fhead "#include \"act-user.h\"\n" \
-	          --fhead "#include \"act-user-manager.h\"\n" \
-	          --fhead "#include \"act-user-enum-types.h\"\n" \
-	          --fhead "#include <glib-object.h>" \
-	          --fprod "\n/* enumerations from \"@filename@\" */" \
-	          --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"    \
-	          --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-	          --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-	         $(^F) ) > $@
-
-ck-manager-generated.c ck-manager-generated.h: org.freedesktop.ConsoleKit.Manager.xml Makefile
-	$(AM_V_GEN) gdbus-codegen --generate-c-code ck-manager-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml
-
-ck-seat-generated.c ck-seat-generated.h: org.freedesktop.ConsoleKit.Seat.xml Makefile
-	$(AM_V_GEN) gdbus-codegen --generate-c-code ck-seat-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Seat.xml
-
-ck-session-generated.c ck-session-generated.h: org.freedesktop.ConsoleKit.Session.xml Makefile
-	$(AM_V_GEN) gdbus-codegen --generate-c-code ck-session-generated --c-namespace ConsoleKit --interface-prefix=org.freedesktop.ConsoleKit $(srcdir)/org.freedesktop.ConsoleKit.Session.xml
-
-BUILT_SOURCES += \
-	act-user-enum-types.c	\
-	act-user-enum-types.h	\
-	ck-manager-generated.c		\
-	ck-manager-generated.h		\
-	ck-seat-generated.c			\
-	ck-seat-generated.h			\
-	ck-session-generated.c		\
-	ck-session-generated.h
-
-CLEANFILES += $(BUILT_SOURCES)
-
-libaccountsservicedir = $(includedir)/accountsservice-1.0/act
-libaccountsservice_headers =                                                  \
-        act-user.h                                                            \
-        act-user-manager.h                                                    \
-        act-user-enum-types.h                                                 \
-        $(END_OF_LIST)
-
-libaccountsservice_HEADERS =                                                  \
-        act.h                                                                 \
-        $(libaccountsservice_headers)                                         \
-        $(END_OF_LIST)
-
-
-libaccountsservice_la_CFLAGS = $(LIBACCOUNTSSERVICE_CFLAGS)
-libaccountsservice_la_LDFLAGS =                                               \
-        -export-symbols-regex '^[^_].*'                                       \
-        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)                  \
-        -no-undefined                                                         \
-        $(END_OF_LIST)
-
-libaccountsservice_la_LIBADD =                                                \
-	../libaccounts-generated.la						\
-        $(LIBACCOUNTSSERVICE_LIBS)                                            \
-        -lcrypt                                                               \
-        $(END_OF_LIST)
-
-libaccountsservice_la_sources =                                               \
-        $(libaccountsservice_headers)                                         \
-        act-user.c                                                            \
-        act-user-manager.c                                                    \
-        $(END_OF_LIST)
-
-libaccountsservice_la_SOURCES =                                               \
-        $(libaccountsservice_la_sources)                                      \
-        act-user-private.h                                                    \
-        $(BUILT_SOURCES)                                                      \
-        $(END_OF_LIST)
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = accountsservice.pc
-
--include $(INTROSPECTION_MAKEFILE)
-
-if HAVE_INTROSPECTION
-girdir = $(datadir)/gir-1.0
-gir_DATA = AccountsService-1.0.gir
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(gir_DATA:.gir=.typelib)
-INTROSPECTION_GIRS = $(gir_DATA)
-
-AccountsService-1.0.gir:                                                      \
-        $(INTROSPECTION_SCANNER)                                              \
-        libaccountsservice.la                                                 \
-        Makefile                                                              \
-        $(END_OF_LIST)
-
-AccountsService_1_0_gir_SCANNERFLAGS =                                        \
-        --warn-all                                                            \
-        --namespace=AccountsService                                           \
-        --identifier-prefix Act                                               \
-        --c-include=act/act.h                                                 \
-        $(libaccountsservice_la_CFLAGS)                                       \
-        $(END_OF_LIST)
-
-AccountsService_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
-AccountsService_1_0_gir_LIBS = libaccountsservice.la
-AccountsService_1_0_gir_FILES =                                               \
-        $(libaccountsservice_la_sources)                                      \
-        $(END_OF_LIST)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif
-
-MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = org.freedesktop.ConsoleKit.Manager.xml org.freedesktop.ConsoleKit.Seat.xml org.freedesktop.ConsoleKit.Session.xml
diff --git a/src/libaccountsservice/accountsservice.deps b/src/libaccountsservice/accountsservice.deps
deleted file mode 100644
index 4853f54..0000000
--- a/src/libaccountsservice/accountsservice.deps
+++ /dev/null
@@ -1,3 +0,0 @@
-glib-2.0
-gobject-2.0
-gio-2.0
\ No newline at end of file
diff --git a/src/libaccountsservice/accountsservice.pc.in b/src/libaccountsservice/accountsservice.pc.in
deleted file mode 100644
index 04548d9..0000000
--- a/src/libaccountsservice/accountsservice.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Accounts Service
-Description: Client Library for communicating with accounts service
-Version: @VERSION@
-Libs: -L${libdir} -laccountsservice
-Cflags: -I${includedir}/accountsservice-1.0