X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=2f20cef6174bace71dfbdecc016a0a7ecbf61da1;hp=a6098c887f2bcadf71ac5d70c5b822070d8efb40;hb=ff79b4df4167e6b06c89ce83212cc8ea4de709eb;hpb=29d681c69d696e37d327a0b9323ec76663bd2937

diff --git a/configure.in b/configure.in
index a6098c8..2f20cef 100644
--- a/configure.in
+++ b/configure.in
@@ -4,21 +4,35 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="0.1.9"
+VERSION="1.0.6"
 AC_SUBST(VERSION)
 
 dnl *************************************************************
 dnl * Define the set of applicable options
 dnl *************************************************************
+AC_ARG_WITH(release,
+	[  --with-release=XXX      set release to XXX [1]],
+	RELEASE=$withval,
+	RELEASE=1)
+	AC_SUBST(RELEASE)
 AC_ARG_WITH(statedir,
 	[  --with-statedir=/foo    use state dir /foo [/var/lib/nfs]],
 	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
@@ -38,13 +52,30 @@ 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 "${CC_FOR_BUILD+set}" = set || CC_FOR_BUILD="$CC"
+AC_SUBST(CC_FOR_BUILD)
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(LD, ld)
+
 AC_STDC_HEADERS
 AC_GNULIBC
 dnl AC_LN_SF
@@ -64,6 +95,9 @@ AC_SUBST(LIBNSL)
 AC_SUBST(LIBCRYPT)
 AC_SUBST(LIBBSD)
 
+AC_TCP_WRAPPER
+AC_SUBST(LIBWRAP)
+
 dnl *************************************************************
 dnl Check for headers
 dnl *************************************************************
@@ -82,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)