New version

[nfs-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index c73e76f5a49f77f8031d98d846d777cb8e11da42..2f20cef6174bace71dfbdecc016a0a7ecbf61da1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="0.3.2"
+VERSION="1.0.6"
 AC_SUBST(VERSION)
 
 dnl *************************************************************
@@ -20,10 +20,19 @@ AC_ARG_WITH(statedir,
        statedir=$withval,
        statedir=/var/lib/nfs)
        AC_SUBST(statedir)
+AC_ARG_WITH(statduser,
+       [  --with-statduser=rpcuser user for statd to run under [rpcuser or nobody]],
+       statduser=$withval,
+       if grep -s '^rpcuser:' /etc/passwd > /dev/null; then
+               statduser=rpcuser
+       else
+               statduser=nobody
+       fi)
+       AC_SUBST(statduser)
 AC_ARG_ENABLE(nfsv3,
        [  --enable-nfsv3          enable support for NFSv3],
        enable_nfsv3=$enableval,
-       enable_nfsv3=no)
+       enable_nfsv3=yes)
        if test "$enable_nfsv3" = yes; then
                AC_DEFINE(NFS3_SUPPORTED)
        else
@@ -43,16 +52,25 @@ AC_ARG_ENABLE(secure-statd,
                AC_DEFINE(RESTRICTED_STATD)
        fi
        AC_SUBST(secure_statd)
+AC_ARG_ENABLE(rquotad,
+       [  --enable-rquotad          enable rquotad],
+       enable_rquotad=$enableval,
+       enable_rquotad=yes)
+       if test "$enable_rquotad" = yes; then
+               RQUOTAD=rquotad
+       else
+               RQUOTAD=
+       fi
+       AC_SUBST(RQUOTAD)
 dnl AC_ARG_ENABLE(frob,        enable frobnicator,,                enable_frob=test)
 AC_CONFIG_HEADER(support/include/config.h)
 
 AC_PROG_CC
-AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-test "${BUILD_CC+set}" = set || BUILD_CC="$CC"
-AC_SUBST(BUILD_CC)
+test "${CC_FOR_BUILD+set}" = set || CC_FOR_BUILD="$CC"
+AC_SUBST(CC_FOR_BUILD)
 
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(AR, ar)
@@ -98,4 +116,4 @@ AC_DEFINE_UNQUOTED(NFS_STATEDIR, "$statedir")
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CFLAGS)
-AC_OUTPUT(config.mk nfs-utils.spec)
+AC_OUTPUT(config.mk nfs-utils.spec utils/Makefile)