umount should succeed even if we cannot contact the server.

[nfs-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index 4f645237d498b52ce93a7ae3f8d3d71e028976f2..2a72c1c7f850c99b71245bd28afec264c99c2e67 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -115,12 +115,26 @@ AC_ARG_ENABLE(rquotad,
                RQUOTAD=
        fi
        AM_CONDITIONAL(CONFIG_RQUOTAD, [test "$enable_rquotad" = "yes"])
-
+AC_ARG_WITH(rpcgen,
+       [AC_HELP_STRING([--with-rpcgen=/usr/bin/rpcgen], [use system rpcgen instead of compiling our own])],
+       if test "$withval" == "yes"; then
+           for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
+           do if test -f $p ; then withval=$p ; break; fi ; done
+       fi
+       RPCGEN_PATH=$withval,
+       RPCGEN_PATH= )
+       AC_SUBST(RPCGEN_PATH)
+       AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" == ""])
+AC_ARG_ENABLE(uuid,
+       [AC_HELP_STRING([--without-uuid], [Exclude uuid support and so avoid possibly buggy libblkid])],
+       if test "$enableval" = "yes" ; then use_blkid=1; else use_blkid=0; fi,
+       use_blkid=1)
+       AC_DEFINE_UNQUOTED(USE_BLKID, $use_blkid, [Define if you want to use blkid to find uuid of filesystems])
 AC_ARG_ENABLE(mount,
        [AC_HELP_STRING([--enable-mount],
                        [Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=no@:>@])],
        enable_mount=$enableval,
-       enable_mount=no)
+       enable_mount=yes)
        AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
 
 # Check whether user wants TCP wrappers support
@@ -187,8 +201,10 @@ fi
 if test "$knfsd_cv_glibc2" = no; then
     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
 fi
-AC_CHECK_LIB(blkid, blkid_get_cache, [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed]))
-AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot file libblkid header file blkid/blkid.h]))
+if test "$use_blkid" = 1; then
+   AC_CHECK_LIB(blkid, blkid_get_cache, [LIBBLKID="-lblkid"], AC_MSG_ERROR([libblkid needed]))
+   AC_CHECK_HEADER(blkid/blkid.h, , AC_MSG_ERROR([Cannot file libblkid header file blkid/blkid.h]))
+fi
 AC_SUBST(LIBSOCKET)
 AC_SUBST(LIBCRYPT)
 AC_SUBST(LIBBSD)