Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 9b84cff305866abd150cf1a4c6e7e5ebf8a7eb3a Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Fri, 15 Nov 2013 23:21:35 +0100 |
| 4 | Subject: [PATCH] configure: Allow to explicitly disable nfsidmap |
| 5 | |
| 6 | * keyutils availability is autodetected and builds aren't reproducible |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 11 | --- |
| 12 | configure.ac | 10 +++++++++- |
| 13 | 1 file changed, 9 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/configure.ac b/configure.ac |
| 16 | index bf433d6..28a8f62 100644 |
| 17 | --- a/configure.ac |
| 18 | +++ b/configure.ac |
| 19 | @@ -69,6 +69,12 @@ AC_ARG_ENABLE(nfsv4, |
| 20 | AC_SUBST(enable_nfsv4) |
| 21 | AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"]) |
| 22 | |
| 23 | +AC_ARG_ENABLE(nfsidmap, |
| 24 | + [AC_HELP_STRING([--enable-nfsidmap], |
| 25 | + [enable support for NFSv4 idmapper @<:@default=yes@:>@])], |
| 26 | + enable_nfsidmap=$enableval, |
| 27 | + enable_nfsidmap=yes) |
| 28 | + |
| 29 | AC_ARG_ENABLE(nfsv41, |
| 30 | [AC_HELP_STRING([--enable-nfsv41], |
| 31 | [enable support for NFSv41 @<:@default=yes@:>@])], |
| 32 | @@ -296,7 +302,7 @@ fi |
| 33 | |
| 34 | dnl enable nfsidmap when its support by libnfsidmap |
| 35 | AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) |
| 36 | -AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"]) |
| 37 | +AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyesyes"]) |
| 38 | |
| 39 | |
| 40 | if test "$knfsd_cv_glibc2" = no; then |
| 41 | -- |
| 42 | 1.8.4.3 |
| 43 | |