diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-09-14 14:22:21 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2011-09-14 14:25:52 -0400 |
| commit | d7c64ddf66b04a225fab249af8a8fdd684551c5c (patch) | |
| tree | 9660fbeea94521de68ddcdfadd99c8ce87502f11 | |
| parent | 80936369ba84e161c324116658e074c830dcaf55 (diff) | |
| download | nfs-utils-d7c64ddf66b04a225fab249af8a8fdd684551c5c.tar.gz nfs-utils-d7c64ddf66b04a225fab249af8a8fdd684551c5c.tar.xz nfs-utils-d7c64ddf66b04a225fab249af8a8fdd684551c5c.zip | |
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>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | aclocal/keyutils.m4 | 4 | ||||
| -rw-r--r-- | aclocal/libnfsidmap.m4 | 3 | ||||
| -rw-r--r-- | 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 |