From 4136dd16f9b0ff6f5864573d74de20a8d62ee07e Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 11 Sep 2013 12:14:16 +0200
Subject: Require systemdsystem{unit,generator}dir. Drop stale unitdir.

---
 Makefile.am  |  2 +-
 configure.ac | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0e81c9f..5099c6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=\$${libdir}/systemd/system \
-	--with-systemdutildir=\$${libdir}/systemd
+	--with-systemdsystemgeneratordir=\$${libdir}/systemd/system-generators
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/gentoo-run.conf
diff --git a/configure.ac b/configure.ac
index 2af3c36..0e03a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,11 +5,18 @@ AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2 subdir-objects])
 
 AC_PROG_SED
 
-# https://bitbucket.org/mgorny/systemd-sdk/
+# https://bitbucket.org/mgorny/systemd-m4/
 SYSTEMD_MISC
+
 SYSTEMD_SYSTEMUNITDIR
+if test -z "$systemdsystemunitdir"; then
+	AC_MSG_ERROR([systemdsystemunitdir must be set])
+fi
+
 SYSTEMD_SYSTEMGENERATORDIR
-SYSTEMD_UTILDIR
+if test -z "$systemdsystemgeneratordir"; then
+	AC_MSG_ERROR([systemdsystemgeneratordir must be set])
+fi
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-- 
cgit v1.2.3-65-gdbad