X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.ac;h=80fb39d3f42e5c89ead0a4f744db9aff509dde20;hp=61b9c004aedaec8fc3c7101c8b60f36eda0fbbdf;hb=3ad7dea527170ae12c9cdc2e428d0676ac261144;hpb=a50ddb07f0868ad8565d94db39b40a5f1a9929f9

diff --git a/configure.ac b/configure.ac
index 61b9c00..80fb39d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-AC_INIT([linux nfs-utils],[1.2.4],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.5],[linux-nfs@vger.kernel.org],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
@@ -76,6 +76,9 @@ AC_ARG_ENABLE(nfsv41,
 	enable_nfsv41=$enableval,
 	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])
+		fi
 		BLKMAPD=blkmapd
 	else
 		enable_nfsv41=