]>
Commit | Line | Data |
---|---|---|
15dae982 JR |
1 | autofs-5.0.8 - allow --with-systemd to take a path arg |
2 | ||
3 | From: Joe MacDonald <joe@deserted.net> | |
4 | ||
5 | If building for a cross-compile environment with systemd it is convenient | |
6 | to be able to specify a systemd path for the target that may not be the | |
7 | same as that on the host. | |
8 | ||
9 | I encountered a problem while working with autofs in a cross-compile | |
10 | environment where the host and target have either differing systemd paths | |
11 | or where one may not have systemd support at all. The common solution | |
12 | I've seen in other projects is to have a --with-systemddir=[path] option, | |
13 | but I thought it'd be simpler to add an optional path argument to the | |
14 | extant '--with-systemd' configure parameter and leave the default =y+probe | |
15 | for path logic in place. | |
16 | ||
17 | Signed-off-by: Joe MacDonald <joe@deserted.net> | |
18 | --- | |
19 | CHANGELOG | 1 + | |
20 | aclocal.m4 | 10 ++++++++-- | |
21 | 2 files changed, 9 insertions(+), 2 deletions(-) | |
22 | ||
23 | diff --git a/CHANGELOG b/CHANGELOG | |
24 | index a01393c..565153d 100644 | |
25 | --- a/CHANGELOG | |
26 | +++ b/CHANGELOG | |
27 | @@ -3,6 +3,7 @@ | |
28 | - fix undefined authtype_requires_creds err if ldap enabled but without sasl. | |
29 | - fix master map type check. | |
30 | - fix task manager not getting signaled. | |
31 | +- allow --with-systemd to take a path arg. | |
32 | ||
33 | 17/10/2013 autofs-5.0.8 | |
34 | ======================= | |
35 | diff --git a/aclocal.m4 b/aclocal.m4 | |
36 | index 3e6f223..105e3e9 100644 | |
37 | --- a/aclocal.m4 | |
38 | +++ b/aclocal.m4 | |
39 | @@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory | |
40 | dnl -------------------------------------------------------------------------- | |
41 | AC_DEFUN([AF_WITH_SYSTEMD], | |
42 | [AC_ARG_WITH(systemd, | |
43 | -[ --with-systemd install systemd unit file if systemd unit directory | |
44 | - is found on system], | |
45 | +[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes' | |
46 | + probe the system for unit directory. | |
47 | + If a path is specified, assume that | |
48 | + is a valid install path.], | |
49 | [if test "$withval" = yes; then | |
50 | if test -z "$systemddir"; then | |
51 | AC_MSG_CHECKING([location of the systemd unit files directory]) | |
52 | @@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], | |
53 | else | |
54 | AC_MSG_RESULT(not found) | |
55 | fi | |
56 | +else | |
57 | + if test "$withval" != no; then | |
58 | + systemddir=$withval | |
59 | + fi | |
60 | fi]) | |
61 | ]) | |
62 |