summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-12-10 23:16:33 +0000
committerColin Watson <cjwatson@debian.org>2016-12-10 23:16:33 +0000
commitc7f7daa9b2ffbbf4c45a2b168802a51acc2263c0 (patch)
treef63ce04e89b3c19ae07e08e8fccc5051f9d8d8d6 /m4
parenta44fb62d0bace296c429cea10b6c48f20e35462e (diff)
Make --disable-cache-owner imply --disable-setuid
* m4/man-arg-setuid.m4: Set man_mode="755" if --disable-cache-owner was given and neither --enable-setuid nor --disable-setuid was given.
Diffstat (limited to 'm4')
-rw-r--r--m4/man-arg-setuid.m49
1 files changed, 7 insertions, 2 deletions
diff --git a/m4/man-arg-setuid.m4 b/m4/man-arg-setuid.m4
index d5a89bfc..e544a1ad 100644
--- a/m4/man-arg-setuid.m4
+++ b/m4/man-arg-setuid.m4
@@ -1,4 +1,4 @@
-# man-arg-setuid.m4 serial 2
+# man-arg-setuid.m4 serial 3
dnl MAN_ARG_SETUID
dnl Add an --enable-setuid option.
@@ -22,6 +22,11 @@ AS_HELP_STRING([--disable-setuid], [don't install man setuid])],
else
AC_MSG_ERROR([--enable-setuid=$enableval is no longer valid; consider --enable-cache-owner=$enableval --enable-setuid instead])
fi],
- [man_mode="4755"])
+ [if test -z "$man_owner"
+ then
+ man_mode="755"
+ else
+ man_mode="4755"
+ fi])
AC_SUBST([man_mode])
])