X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=blobdiff_plain;f=configure.ac;h=922263835a7a1d36974f1d24a10fae33f656a1ca;hp=2d4c568f3445ce78c22bd1435293c30b22e0f494;hb=78694cf1ecac743ce862793e4b821fac379f7a94;hpb=2443dd94c6f45310878125aaf9a04f76116c20cf

diff --git a/configure.ac b/configure.ac
index 2d4c568..9222638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([ddns],
-	[003],
+	[007],
 	[info@ipfire.org],
 	[ddns],
 	[http://git.ipfire.org/?p=oddments/ddns.git;a=summary])
@@ -56,22 +56,56 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
 # Python
 AM_PATH_PYTHON([2.7])
 
-# BIND nsupdate
-AC_CHECK_TOOL([NSUPDATE], [nsupdate])
-if test -z "${NSUPDATE}"; then
-	AC_MSG_ERROR([*** nsupdate not found])
-fi
-
 save_LIBS="$LIBS"
 
+# pkg-config
+PKG_PROG_PKG_CONFIG
+# This makes sure pkg.m4 is available.
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
+
 # ------------------------------------------------------------------------------
 have_manpages=no
-AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
+AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-man-pages],
+	[do not install man pages]))
 AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes])
 AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"])
 
 # ------------------------------------------------------------------------------
 
+AC_ARG_WITH([systemd],
+	AS_HELP_STRING([--with-systemd], [Enable systemd support.])
+)
+
+AS_IF([test "x$with_systemd" != "xno"],
+      [PKG_CHECK_MODULES(systemd, [libsystemd],
+      [have_systemd=yes], [have_systemd=no])],
+      [have_systemd=no]
+)
+
+AS_IF([test "x$have_systemd" = "xyes"],
+      [AC_MSG_CHECKING([for systemd system unit directory])
+	AC_ARG_WITH([systemdsystemunitdir],
+		AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+		[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]
+	)
+
+	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+
+	if test -n "$systemdsystemunitdir" -a "x$systemdsystemunitdir" != xno; then
+		AC_MSG_RESULT([$systemdsystemunitdir])
+	else
+		AC_MSG_ERROR([not found (try --with-systemdsystemunitdir)])
+	fi
+      ],
+      [AS_IF([test "x$with_systemd" = "xyes"],
+             [AC_MSG_ERROR([Systemd support is enabled but no systemd has been found.])
+      ])
+])
+
+AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$have_systemd" = "xyes"])
+
+# ------------------------------------------------------------------------------
+
 AC_CONFIG_FILES([
 	Makefile
 	po/Makefile.in
@@ -82,10 +116,9 @@ AC_OUTPUT
 AC_MSG_RESULT([
 	${PACKAGE_NAME} ${VERSION}
 
-	prefix            : ${prefix}
-	sysconfdir        : ${sysconfdir}
-
-	nsupdate          : ${NSUPDATE}
+	prefix:			${prefix}
+	sysconfdir:		${sysconfdir}
 
-	Generate manpages : ${have_manpages}
+	Systemd support		${have_systemd}
+	Generate man-pages:	${have_manpages}
 ])