mountd: Ensure cache downcall can handle IPv6 addresses

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9ad64edd27128753059b3fd50f834e9b25346a4d..7c9e61a45b2ccaae5ffc933a414de642fe8e3239 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.0],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.2],[linux-nfs@vger.kernel.org],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
@@ -72,6 +72,20 @@ AC_ARG_ENABLE(nfsv4,
        AC_SUBST(IDMAPD)
        AC_SUBST(enable_nfsv4)
        AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
+
+AC_ARG_ENABLE(nfsv41,
+       [AC_HELP_STRING([--enable-nfsv41],
+                        [enable support for NFSv41 @<:@default=no@:>@])],
+       enable_nfsv41=$enableval,
+       enable_nfsv41=no)
+       if test "$enable_nfsv41" = yes; then
+               AC_DEFINE(NFS41_SUPPORTED, 1, [Define this if you want NFSv41 support compiled in])
+       else
+               enable_nfsv41=
+       fi
+       AC_SUBST(enable_nfsv41)
+       AM_CONDITIONAL(CONFIG_NFSV41, [test "$enable_nfsv41" = "yes"])
+
 AC_ARG_ENABLE(gss,
        [AC_HELP_STRING([--enable-gss],
                         [enable support for rpcsec_gss @<:@default=yes@:>@])],
@@ -120,9 +134,9 @@ AC_ARG_ENABLE(mount,
        AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
 AC_ARG_ENABLE(tirpc,
        [AC_HELP_STRING([--enable-tirpc],
-                       [enable use of TI-RPC @<:@default=no@:>@])],
+                       [enable use of TI-RPC @<:@default=yes@:>@])],
        enable_tirpc=$enableval,
-       enable_tirpc=no)
+       enable_tirpc='yes')
 AC_ARG_ENABLE(ipv6,
        [AC_HELP_STRING([--enable-ipv6],
                         [enable support for IPv6 @<:@default=no@:>@])],
@@ -136,9 +150,39 @@ AC_ARG_ENABLE(ipv6,
        AC_SUBST(enable_ipv6)
        AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"])
 
+if test "$enable_mount" = yes; then
+       AC_ARG_ENABLE(mountconfig,
+       [AC_HELP_STRING([--enable-mountconfig],
+                        [enable mount to use a configuration file])],
+       mountconfig=$enableval,
+       mountconfig=no)
+       if test "$enable_mountconfig" = yes; then
+               AC_DEFINE(MOUNT_CONFIG, 1, 
+                       [Define this if you want mount to read a configuration file])
+               AC_ARG_WITH(mountfile,
+                       [AC_HELP_STRING([--with-mountfile=filename],
+                       [Using filename as the NFS mount options file [/etc/nfsmounts.conf]]
+                       )],
+               mountfile=$withval,
+               mountfile=/etc/nfsmount.conf)
+               AC_SUBST(mountfile)
+               AC_DEFINE_UNQUOTED(MOUNTOPTS_CONFFILE, "$mountfile", 
+                       [This defines the location of the NFS mount configuration file])
+       else
+               enable_mountconfig=
+       fi
+       AC_SUBST(enable_mountconfig)
+       AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mountconfig" = "yes"])
+else
+       AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"])
+fi
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC
 
+dnl Check for -lcap
+AC_LIBCAP
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -300,7 +344,7 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
-               getnameinfo getrpcbyname \
+               getnameinfo getrpcbyname getifaddrs \
                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
                realpath rmdir select socket strcasecmp strchr strdup \
                strerror strrchr strtol strtoul sigprocmask])
@@ -356,7 +400,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"])
 
@@ -375,11 +419,14 @@ AC_CONFIG_FILES([
        support/include/Makefile
        support/misc/Makefile
        support/nfs/Makefile
+       support/nsm/Makefile
        tools/Makefile
        tools/locktest/Makefile
        tools/nlmtest/Makefile
        tools/rpcdebug/Makefile
        tools/rpcgen/Makefile
+       tools/mountstats/Makefile
+       tools/nfs-iostat/Makefile
        utils/Makefile
        utils/exportfs/Makefile
        utils/gssd/Makefile
@@ -389,6 +436,8 @@ AC_CONFIG_FILES([
        utils/nfsd/Makefile
        utils/nfsstat/Makefile
        utils/showmount/Makefile
-       utils/statd/Makefile])
+       utils/statd/Makefile
+       tests/Makefile
+       tests/nsm_client/Makefile])
 AC_OUTPUT