diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | aclocal/libnfsidmap.m4 | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | utils/Makefile.am | 3 |
4 files changed, 11 insertions, 0 deletions
@@ -64,6 +64,7 @@ tests/nsm_client/nlm_sm_inter.h tests/nsm_client/nlm_sm_inter_clnt.c tests/nsm_client/nlm_sm_inter_svc.c tests/nsm_client/nlm_sm_inter_xdr.c +utils/nfsidmap/nfsidmap # cscope database files cscope.* # generic editor backup et al diff --git a/aclocal/libnfsidmap.m4 b/aclocal/libnfsidmap.m4 index cfcde2f..4faa923 100644 --- a/aclocal/libnfsidmap.m4 +++ b/aclocal/libnfsidmap.m4 @@ -14,4 +14,8 @@ AC_DEFUN([AC_LIBNFSIDMAP], [ [AC_DEFINE([HAVE_NFS4_SET_DEBUG], 1, [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]) + ])dnl diff --git a/configure.ac b/configure.ac index b39dbcd..92833e3 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,9 @@ if test "$enable_nfsv4" = yes; then dnl check for nfsidmap libraries and headers AC_LIBNFSIDMAP + dnl enable nfsidmap when its support by libnfsidmap + AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) + dnl check for the keyutils libraries and headers AC_KEYUTILS diff --git a/utils/Makefile.am b/utils/Makefile.am index 8665183..a0ea116 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,6 +4,9 @@ OPTDIRS = if CONFIG_NFSV4 OPTDIRS += idmapd +if CONFIG_NFSIDMAP +OPTDIRS += nfsidmap +endif endif if CONFIG_GSS |