X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.ac;h=71297fd36e204b2eacdce6b6443c03fb191afe74;hp=825682c88058af29e310f11cdf75e8e9d7cdb01f;hb=0311ecf6d200879cb15eb358f23207f41f4863b2;hpb=37ebcfc42478bbbf5784504072b682037352a90e

diff --git a/configure.ac b/configure.ac
index 825682c..71297fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,8 @@ AC_ARG_ENABLE(nfsv41,
 	enable_nfsv41=yes)
 	if test "$enable_nfsv41" = yes; then
 		if test "$enable_nfsv4" != yes; then
-			AC_MSG_ERROR([NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41])
+			AC_MSG_WARN([NFS v4 is not enabled. Disabling NFS v4.1])
+			enable_nfsv41=no
 		fi
 		BLKMAPD=blkmapd
 	else
@@ -278,11 +279,8 @@ if test "$enable_nfsv4" = yes; then
 	fi
   fi
 
-  dnl librpcsecgss already has a dependency on libgssapi,
-  dnl but we need to make sure we get the right version
-  if test "$enable_gss" = yes; then
-    AC_RPCSEC_VERSION
-  fi
+else
+  enable_nfsdcltrack="no"
 fi
 
 if test "$enable_nfsv41" = yes; then
@@ -342,6 +340,11 @@ if test "$enable_gss" = yes; then
   dnl Invoked after AC_KERBEROS_V5; AC_LIBRPCSECGSS needs to have KRBLIBS set
   AC_LIBRPCSECGSS
 
+  dnl librpcsecgss already has a dependency on libgssapi,
+  dnl but we need to make sure we get the right version
+  if test "$enable_gss" = yes; then
+    AC_RPCSEC_VERSION
+  fi
 fi
 
 dnl Check for IPv6 support