configure.ac: Remove the NFS v3 enable flag

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3132fe4f29f4d113fc900f36982f59e453e4d9f0..7f4b88cfb1eab6e991c33c98e4f525fe67b8e867 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,14 @@ AC_ARG_WITH(statedir,
        statedir=$withval,
        statedir=/var/lib/nfs)
        AC_SUBST(statedir)
+AC_ARG_WITH(statdpath,
+       [AC_HELP_STRING([--with-statdpath=/foo @<:@default=/var/lib/nfs@:>@],
+               [define statd's state dir as /foo instead of the NFS statedir]
+       )],
+       statdpath=$withval,
+       statdpath=$statedir
+       )
+       AC_SUBST(statdpath)
 AC_ARG_WITH(statduser,
        [AC_HELP_STRING([--with-statduser=rpcuser],
                         [statd to run under @<:@rpcuser or nobody@:>@]
@@ -47,17 +55,6 @@ AC_ARG_WITH(start-statd,
        )
        AC_SUBST(startstatd)
        AC_DEFINE_UNQUOTED(START_STATD, "$startstatd", [Define this to a script which can start statd on mount])
-AC_ARG_ENABLE(nfsv3,
-       [AC_HELP_STRING([--enable-nfsv3],
-                        [enable support for NFSv3 @<:@default=yes@:>@])],
-       enable_nfsv3=$enableval,
-       enable_nfsv3=yes)
-       if test "$enable_nfsv3" = yes; then
-               AC_DEFINE(NFS3_SUPPORTED, 1, [Define this if you want NFSv3 support compiled in])
-       else
-               enable_nfsv3=
-       fi
-       AC_SUBST(enable_nfsv3)
 AC_ARG_ENABLE(nfsv4,
        [AC_HELP_STRING([--enable-nfsv4],
                         [enable support for NFSv4 @<:@default=yes@:>@])],
@@ -76,13 +73,15 @@ AC_ARG_ENABLE(nfsv4,
 
 AC_ARG_ENABLE(nfsv41,
        [AC_HELP_STRING([--enable-nfsv41],
-                        [enable support for NFSv41 @<:@default=no@:>@])],
+                        [enable support for NFSv41 @<:@default=yes@:>@])],
        enable_nfsv41=$enableval,
-       enable_nfsv41=no)
+       enable_nfsv41=yes)
        if test "$enable_nfsv41" = yes; then
+               BLKMAPD=blkmapd
                AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
        else
                enable_nfsv41=
+               BLKMAPD=
        fi
        AC_SUBST(enable_nfsv41)
        AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"])
@@ -129,7 +128,7 @@ AC_ARG_ENABLE(uuid,
        choose_blkid=default)
 AC_ARG_ENABLE(mount,
        [AC_HELP_STRING([--enable-mount],
-                       [Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=yes@:>@])],
+                       [Create mount.nfs and do not use the util-linux mount(8) functionality. @<:@default=yes@:>@])],
        enable_mount=$enableval,
        enable_mount=yes)
        AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
@@ -387,6 +386,7 @@ dnl *************************************************************
 dnl Export some path names to config.h
 dnl *************************************************************
 AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir", [This defines the location of the NFS state files. Warning: this must match definitions in config.mk!])
+AC_DEFINE_UNQUOTED(NSM_DEFAULT_STATEDIR, "$statdpath", [Define this to the pathname where statd keeps its state file])
 
 if test "x$cross_compiling" = "xno"; then
        CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
@@ -451,6 +451,7 @@ AC_CONFIG_FILES([
        tools/mountstats/Makefile
        tools/nfs-iostat/Makefile
        utils/Makefile
+       utils/blkmapd/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
        utils/idmapd/Makefile