nfsidmap: auto disable when keyutils is not found

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ca12f9ea455231e0c1a43370ff038cfe517c936b..1a28f8a4cd50367397d478e64626027ef35c4ca3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,14 +114,14 @@ AC_ARG_WITH(rpcgen,
        rpcgen_path=$withval,
        rpcgen_path=yes )
        RPCGEN_PATH=
-       if test "$rpcgen_path" == "yes"; then
+       if test "$rpcgen_path" = "yes"; then
            for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
            do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
        elif test "$rpcgen_path" != "internal"; then
            RPCGEN_PATH=$rpcgen_path
        fi
        AC_SUBST(RPCGEN_PATH)
-       AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" == ""])
+       AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""])
 AC_ARG_ENABLE(uuid,
        [AC_HELP_STRING([--disable-uuid], [Exclude uuid support to avoid buggy libblkid])],
        if test "$enableval" = "yes" ; then choose_blkid=yes; else choose_blkid=no; fi,
@@ -137,7 +137,7 @@ if test "$enable_mount" = yes; then
        AC_ARG_ENABLE(libmount-mount,
                [AC_HELP_STRING([--enable-libmount-mount],
                                [Link mount.nfs with libmount (EXPERIMENTAL)])],
-               enable_libmount=yes,
+               enable_libmount=$enableval,
                enable_libmount=no)
 fi
 
@@ -256,9 +256,6 @@ 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
 
@@ -268,6 +265,9 @@ if test "$enable_nfsv4" = yes; then
     AC_RPCSEC_VERSION
   fi
 fi
+dnl enable nfsidmap when its support by libnfsidmap
+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
     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])