2002-01-02 Chip Salzenberg <chip@pobox.com>

[nfs-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index 89ac3918fad9cb7181a9c9993737d85a71138faf..b5d6e2d3d89f68a9b6c27db757c39fd6970b4960 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,12 +4,17 @@ AC_INIT(rules.mk)
 AC_PREFIX_DEFAULT(/usr)
 
 # The nfs-utils version
-VERSION="0.1.6"
+VERSION="1.0"
 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,
@@ -18,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
@@ -38,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
@@ -64,6 +86,9 @@ AC_SUBST(LIBNSL)
 AC_SUBST(LIBCRYPT)
 AC_SUBST(LIBBSD)
 
+AC_TCP_WRAPPER
+AC_SUBST(LIBWRAP)
+
 dnl *************************************************************
 dnl Check for headers
 dnl *************************************************************
@@ -82,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)