X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=5eb1d798ec398718c0a53eefbb7678d12275c34a;hp=a123bce361b5aec83c310cf0863cd1b66d5d401f;hb=4e2bae795e5eaf9922f0b966ab5df64994c836a2;hpb=5ef15b8cb696c5b5fd62185dbbbc66b519204455

diff --git a/configure.in b/configure.in
index a123bce..5eb1d79 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-AC_INIT([linux nfs-utils],[1.0.8-rc4],[nfs@lists.sf.net],[nfs-utils])
+AC_INIT([linux nfs-utils],[1.0.8],[nfs@lists.sf.net],[nfs-utils])
 AC_CANONICAL_BUILD([])
 AC_CANONICAL_HOST([])
 AC_CONFIG_SRCDIR(tools/getiversion/getiversion.c)
@@ -107,6 +107,13 @@ AC_ARG_ENABLE(rquotad,
 	fi
 	AM_CONDITIONAL(CONFIG_RQUOTAD, [test "$enable_rquotad" = "yes"])
 
+AC_ARG_WITH(mount,
+	[AC_HELP_STRING([--without-mount],
+			[Create mount.nfs and do not use the util-linux mount(8) functionality. By default it doesn't.])],
+	use_mount=$withval,
+	use_mount=yes)
+	AM_CONDITIONAL(CONFIG_NOMOUNT, [test "$use_mount" = "no"])
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -149,13 +156,16 @@ if test "$enable_nfsv4" = yes; then
     AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)])
     AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
     dnl librpcsecgss already has a dependency on libgssapi,
-    dnl so we don't need to do an explicit check for libgssapi here
-    PKG_CHECK_MODULES(RPCSECGSS, librpcsecgss, [],
+    dnl but we need to make sure we get the right version
+    if test "$enable_gss" = yes; then
+     PKG_CHECK_MODULES([RPCSECGSS], [librpcsecgss >= 0.10], [],
       [AC_MSG_ERROR([Unable to locate information required to use librpcsecgss.
        If you have pkgconfig installed, you might try setting environment
        variable PKG_CONFIG_PATH to /usr/local/lib/pkgconfig])
       ]
-    )
+     )
+    PKG_CHECK_MODULES([GSSAPI], [libgssapi >= 0.9])
+    fi
 
 fi
 if test "$knfsd_cv_glibc2" = no; then
@@ -189,7 +199,8 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
                  malloc.h memory.h netdb.h netinet/in.h paths.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
-                 syslog.h unistd.h com_err.h et/com_err.h])
+                 syslog.h unistd.h com_err.h et/com_err.h \
+                 ifaddrs.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
@@ -225,7 +236,7 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
-               gettimeofday hasmntopt inet_ntoa memset mkdir pathconf \
+               gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
                realpath rmdir select socket strcasecmp strchr strdup \
                strerror strrchr strtol strtoul])
 
@@ -310,6 +321,7 @@ AC_CONFIG_FILES([
 	utils/gssd/Makefile
 	utils/idmapd/Makefile
 	utils/lockd/Makefile
+	utils/mount/Makefile
 	utils/mountd/Makefile
 	utils/nfsd/Makefile
 	utils/nfsstat/Makefile