X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=2ed751b9a4a038b932c67024e82d6c355e12cac4;hp=124065632cc13e1d34051b2349aedaa29dac3196;hb=060f523e68274fcd04eb8ecdae51688cb864a5f9;hpb=453ac684258684e0e8413f4d9ef9822e753d9dbb

diff --git a/configure.in b/configure.in
index 1240656..2ed751b 100644
--- a/configure.in
+++ b/configure.in
@@ -116,20 +116,28 @@ AC_ARG_ENABLE(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
+	[AC_HELP_STRING([--with-rpcgen=internal], [use internal rpcgen instead of system one])],
+	rpcgen_path=$withval,
+	rpcgen_path=yes )
+	RPCGEN_PATH=
+	if test "$rpcgen_path" == "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
+	    do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
+	elif test "$rpcgen_path" != "internal"; then
+	    RPCGEN_PATH=$rpcgen_path
 	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
@@ -196,8 +204,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)