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
|
From 5606a69f9981948e1d6a36df763b2f16c43f080b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 2 Sep 2011 14:56:59 -0400
Subject: [PATCH] nfsidmap: auto disable when keyutils is not found
Since we already auto-disable based on libnfsidmap capabilities, don't
make keyutils a hard failure.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
aclocal/keyutils.m4 | 4 ++--
aclocal/libnfsidmap.m4 | 3 +--
configure.ac | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/aclocal/keyutils.m4 b/aclocal/keyutils.m4
index 84bc112..a392c0e 100644
--- a/aclocal/keyutils.m4
+++ b/aclocal/keyutils.m4
@@ -6,6 +6,6 @@ AC_DEFUN([AC_KEYUTILS], [
AC_CHECK_LIB([keyutils], [keyctl_instantiate], [LIBKEYUTILS=-lkeyutils], ,)
AC_SUBST(LIBKEYUTILS)
- AC_CHECK_HEADERS([keyutils.h], ,
- [AC_MSG_ERROR([keyutils.h header not found.])])
+ AC_CHECK_HEADERS([keyutils.h])
+
])dnl
diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4
index 4faa923..484b1ec 100644
--- a/aclocal/libnfsidmap.m4
+++ b/aclocal/libnfsidmap.m4
@@ -15,7 +15,6 @@ AC_DEFUN([AC_LIBNFSIDMAP], [
[Define to 1 if you have the `nfs4_set_debug' function.])])
dnl only enable nfsidmap when libnfsidmap supports it
- AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid], [enable_nfsidmap=yes],
- [enable_nfsidmap=no])
+ AC_CHECK_LIB([nfsidmap], [nfs4_owner_to_uid])
])dnl
diff --git a/configure.ac b/configure.ac
index c9fb27b..1a28f8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ if test "$enable_nfsv4" = yes; then
fi
fi
dnl enable nfsidmap when its support by libnfsidmap
-AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
+AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
if test "$knfsd_cv_glibc2" = no; then
--
1.7.6
|
GitWeb
