X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=93588c22b1b695395c5aa58e51a10d58962e9b1f;hp=c01093bf704c0e690c99254d3c94c7a688528cd8;hb=021751e2e70c0d629bf196065816949e38b158d9;hpb=8ade51f86f94d914d6eb4e460996c7b5a6658062

diff --git a/configure.in b/configure.in
index c01093b..93588c2 100644
--- a/configure.in
+++ b/configure.in
@@ -4,27 +4,54 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="0.1.8.2"
+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
 		enable_nfsv3=
 	fi
 	AC_SUBST(enable_nfsv3)
+AC_ARG_ENABLE(nfsv4,
+	[  --enable-nfsv4          enable support for NFSv4],
+	enable_nfsv4=$enableval,
+	enable_nfsv4=yes)
+	if test "$enable_nfsv4" = yes; then
+		AC_DEFINE(NFS4_SUPPORTED)
+		IDMAPD=idmapd
+	else
+		enable_nfsv4=
+		IDMAPD=
+	fi
+	AC_SUBST(IDMAPD)
+	AC_SUBST(enable_nfsv4)
 AC_ARG_ENABLE(kprefix,
 	[  --enable-kprefix       install progs as rpc.knfsd etc],
 	test "$enableval" = "yes" && kprefix=k,
@@ -38,13 +65,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
@@ -56,6 +100,12 @@ dnl *************************************************************
 AC_CHECK_LIB(socket, main, [LIBSOCKET="-lnsl"])
 AC_CHECK_LIB(nsl, main,	[LIBNSL="-lnsl"])
 AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"])
+if test "$enable_nfsv4" = yes; then
+    AC_CHECK_LIB(event, event_dispatch)
+    AC_CHECK_LIB(nfsidmap, nfs4_uid_to_name)
+    AC_CHECK_HEADERS(event.h)
+    AC_CHECK_HEADERS(nfsidmap.h)
+fi
 if test "$knfsd_cv_glibc2" = no; then
     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
 fi
@@ -64,6 +114,9 @@ AC_SUBST(LIBNSL)
 AC_SUBST(LIBCRYPT)
 AC_SUBST(LIBBSD)
 
+AC_TCP_WRAPPER
+AC_SUBST(LIBWRAP)
+
 dnl *************************************************************
 dnl Check for headers
 dnl *************************************************************
@@ -82,4 +135,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)