X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=b5d6e2d3d89f68a9b6c27db757c39fd6970b4960;hp=8287767f48a6373c325d15d3eb46fcef082654e0;hb=7a1b307cfbdbb2364274252b21094d9f2207342b;hpb=2d60c14684d1f7bb8b15428e5f76c34888a462b9

diff --git a/configure.in b/configure.in
index 8287767..b5d6e2d 100644
--- 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"
 AC_SUBST(VERSION)
 
 dnl *************************************************************
@@ -23,7 +23,7 @@ AC_ARG_WITH(statedir,
 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,13 +43,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
@@ -90,4 +107,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)