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 /aclocal | |
| 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>
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/keyutils.m4 | 4 | ||||
| -rw-r--r-- | aclocal/libnfsidmap.m4 | 3 |
2 files changed, 3 insertions, 4 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 |