Merge branch 'upstream'

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7f4b88cfb1eab6e991c33c98e4f525fe67b8e867..80fb39d3f42e5c89ead0a4f744db9aff509dde20 100644 (file)
--- 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)
@@ -61,7 +61,6 @@ AC_ARG_ENABLE(nfsv4,
        enable_nfsv4=$enableval,
        enable_nfsv4=yes)
        if test "$enable_nfsv4" = yes; then
-               AC_DEFINE(NFS4_SUPPORTED, 1, [Define this if you want NFSv4 support compiled in])
                IDMAPD=idmapd
        else
                enable_nfsv4=
@@ -77,8 +76,10 @@ 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
-               AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
        else
                enable_nfsv41=
                BLKMAPD=
@@ -92,7 +93,6 @@ AC_ARG_ENABLE(gss,
        enable_gss=$enableval,
        enable_gss=yes)
        if test "$enable_gss" = yes; then
-               AC_DEFINE(GSS_SUPPORTED, 1, [Define this if you want rpcsec_gss support compiled in])
                GSSD=gssd
                SVCGSSD=svcgssd
        else