1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From 924fd52ac95ed530091308876342d1cdbab01c80 Mon Sep 17 00:00:00 2001
From: Simon Fels <simon.fels@canonical.com>
Date: Fri, 28 Apr 2017 08:04:39 +0200
Subject: [PATCH] cmd: make rst2man optional
---
cmd/Makefile.am | 8 ++++++++
cmd/configure.ac | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 9474944..26dd010 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -187,9 +187,11 @@ all_tests = \
snap-confine/tests/test_whitelist
libexec_PROGRAMS += snap-confine/snap-confine
+if HAVE_RST2MAN
dist_man_MANS += snap-confine/snap-confine.5
CLEANFILES += snap-confine/snap-confine.5
EXTRA_DIST += snap-confine/snap-confine.rst
+endif
EXTRA_DIST += snap-confine/snap-confine.apparmor.in
EXTRA_DIST += $(all_tests) snap-confine/tests/common.sh
if SECCOMP
@@ -307,9 +309,11 @@ snap-confine/unit-tests$(EXEEXT): $(snap_confine_unit_tests_OBJECTS) $(snap_conf
snap-confine/unit-tests$(EXEEXT): LIBS += -Wl,-Bstatic $(snap_confine_unit_tests_STATIC) -Wl,-Bdynamic -pthread
endif # WITH_UNIT_TESTS
+if HAVE_RST2MAN
snap-confine/%.5: snap-confine/%.rst
mkdir -p snap-confine
$(HAVE_RST2MAN) $^ > $@
+endif
snap-confine/snap-confine.apparmor: snap-confine/snap-confine.apparmor.in Makefile
sed -e 's,[@]LIBEXECDIR[@],$(libexecdir),g' -e 's,[@]SNAP_MOUNT_DIR[@],$(SNAP_MOUNT_DIR),' <$< >$@
@@ -372,9 +376,11 @@ install-exec-local::
##
libexec_PROGRAMS += snap-discard-ns/snap-discard-ns
+if HAVE_RST2MAN
dist_man_MANS += snap-discard-ns/snap-discard-ns.5
CLEANFILES += snap-discard-ns/snap-discard-ns.5
EXTRA_DIST += snap-discard-ns/snap-discard-ns.rst
+endif
snap_discard_ns_snap_discard_ns_SOURCES = \
snap-confine/ns-support.c \
@@ -409,9 +415,11 @@ snap-discard-ns/snap-discard-ns$(EXEEXT): $(snap_discard_ns_snap_discard_ns_OBJE
snap-discard-ns/snap-discard-ns$(EXEEXT): LIBS += -Wl,-Bstatic $(snap_discard_ns_snap_discard_ns_STATIC) -Wl,-Bdynamic -pthread
+if HAVE_RST2MAN
snap-discard-ns/%.5: snap-discard-ns/%.rst
mkdir -p snap-discard-ns
$(HAVE_RST2MAN) $^ > $@
+endif
##
## system-shutdown
diff --git a/cmd/configure.ac b/cmd/configure.ac
index 39a6800..bcd142a 100644
--- a/cmd/configure.ac
+++ b/cmd/configure.ac
@@ -175,7 +175,8 @@ AS_IF([test "x$enable_caps_over_setuid" = "xyes"], [
[Use capabilities rather than setuid bit])])
AC_PATH_PROGS([HAVE_RST2MAN],[rst2man rst2man.py])
-AS_IF([test "x$HAVE_RST2MAN" = "x"], [AC_MSG_ERROR(["cannot find the rst2man tool, install python-docutils or similar"])])
+AS_IF([test "x$HAVE_RST2MAN" = "x"], [AC_MSG_WARN(["cannot find the rst2man tool, install python-docutils or similar"])])
+AM_CONDITIONAL([HAVE_RST2MAN], [test "x${HAVE_RST2MAN}" != "x"])
AC_PATH_PROG([HAVE_SHELLCHECK],[shellcheck])
AM_CONDITIONAL([HAVE_SHELLCHECK], [test "x${HAVE_SHELLCHECK}" != "x"])
--
2.7.4
|
