mount: Recognize zero as a valid value for the port= option

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f6b11891c8c2f4156cae5f79f7be13212db8eb5d..92833e3f5b9e8c13206a9dd5a272725aa7f9fce4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-AC_INIT([linux nfs-utils],[1.2.1],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.3],[linux-nfs@vger.kernel.org],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
@@ -81,7 +81,7 @@ AC_ARG_ENABLE(nfsv41,
        if test "$enable_nfsv41" = yes; then
                AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
        else
-               enable_nfsv4=
+               enable_nfsv41=
        fi
        AC_SUBST(enable_nfsv41)
        AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"])
@@ -136,7 +136,7 @@ AC_ARG_ENABLE(tirpc,
        [AC_HELP_STRING([--enable-tirpc],
                        [enable use of TI-RPC @<:@default=yes@:>@])],
        enable_tirpc=$enableval,
-       enable_tirpc='yes')
+       enable_tirpc='')
 AC_ARG_ENABLE(ipv6,
        [AC_HELP_STRING([--enable-ipv6],
                         [enable support for IPv6 @<:@default=no@:>@])],
@@ -247,6 +247,12 @@ if test "$enable_nfsv4" = yes; then
   dnl check for nfsidmap libraries and headers
   AC_LIBNFSIDMAP
 
+  dnl enable nfsidmap when its support by libnfsidmap
+  AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"])
+
+  dnl check for the keyutils libraries and headers
+  AC_KEYUTILS
+
   dnl librpcsecgss already has a dependency on libgssapi,
   dnl but we need to make sure we get the right version
   if test "$enable_gss" = yes; then
@@ -400,7 +406,7 @@ case $host in
     ARCHFLAGS="" ;;
 esac
 
-my_am_cflags="-Wall -Wstrict-prototypes $ARCHFLAGS -pipe"
+my_am_cflags="-Wall -Wextra -Wstrict-prototypes $ARCHFLAGS -pipe"
 
 AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
 
@@ -425,6 +431,8 @@ AC_CONFIG_FILES([
        tools/nlmtest/Makefile
        tools/rpcdebug/Makefile
        tools/rpcgen/Makefile
+       tools/mountstats/Makefile
+       tools/nfs-iostat/Makefile
        utils/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
@@ -433,6 +441,7 @@ AC_CONFIG_FILES([
        utils/mountd/Makefile
        utils/nfsd/Makefile
        utils/nfsstat/Makefile
+       utils/nfsidmap/Makefile
        utils/showmount/Makefile
        utils/statd/Makefile
        tests/Makefile