mount.nfs: Assume v2/v3 if mount-related options are present

[nfs-utils.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e09e1d9a092997c38855fd379bd1ab439c449473..1b653e4c1727b87dc4424b20f1f5e57c7da48606 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.1.6],[linux-nfs@vger.kernel.org],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.2.0],[linux-nfs@vger.kernel.org],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_MACRO_DIR(aclocal)
@@ -120,9 +120,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,6 +136,31 @@ 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"])
+fi
+
 dnl Check for TI-RPC library and headers
 AC_LIBTIRPC