42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
From cc5b9c30f5e8312ee8905f7882da7ab79fef571c Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Fri, 27 Dec 2013 23:44:27 -0500
|
|
Subject: [PATCH] man: include autoconf snippet in daemon(7)
|
|
|
|
https://bugs.freedesktop.org/show_bug.cgi?id=40446
|
|
---
|
|
man/daemon.xml | 20 ++++++++++++++------
|
|
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/man/daemon.xml b/man/daemon.xml
|
|
index 1fe4546..105826a 100644
|
|
--- a/man/daemon.xml
|
|
+++ b/man/daemon.xml
|
|
@@ -765,12 +765,20 @@
|
|
|
|
<programlisting>PKG_PROG_PKG_CONFIG
|
|
AC_ARG_WITH([systemdsystemunitdir],
|
|
- AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
|
|
- [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
|
|
-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 ])</programlisting>
|
|
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),,
|
|
+ [with_systemdsystemunitdir=auto])
|
|
+AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
|
|
+ def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
|
|
+
|
|
+ AS_IF([test "x$def_systemdsystemunitdir" = "x"],
|
|
+ [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
|
|
+ [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
|
|
+ with_systemdsystemunitdir=no],
|
|
+ [with_systemdsystemunitdir=$def_systemdsystemunitdir])])
|
|
+AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
|
|
+ [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
|
|
+AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
|
|
+</programlisting>
|
|
|
|
<para>This snippet allows automatic
|
|
installation of the unit files on systemd
|