statd: Decouple statd's state directory from the NFS state directory

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f8b079609143c02724924fa91b40528dff3471ae..500172b79bd30689a6b44367f562be0a6121c19b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,10 +18,19 @@ AC_ARG_WITH(release,
        RELEASE=1)
        AC_SUBST(RELEASE)
 AC_ARG_WITH(statedir,
-       [  --with-statedir=/foo    use state dir /foo [/var/lib/nfs]],
+       [AC_HELP_STRING([--with-statedir=/foo],
+                       [use state dir /foo @<:@default=/var/lib/nfs@:>@])],
        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@:>@]
@@ -114,21 +123,21 @@ 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,
        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"])
@@ -137,7 +146,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
 
@@ -249,9 +258,6 @@ AC_CHECK_FUNC([getservbyname], ,
 
 AC_CHECK_LIB([crypt], [crypt], [LIBCRYPT="-lcrypt"])
 
-dnl enable nfsidmap when its support by libnfsidmap
-AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
-
 if test "$enable_nfsv4" = yes; then
   dnl check for libevent libraries and headers
   AC_LIBEVENT
@@ -268,6 +274,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"])
@@ -386,6 +395,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"}