X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure.in;h=ded529ffba96ea3aae6b3f95e90023db0f29ef01;hp=4d4d2f47aef703aaefd6a5fd4ebe36300e6235d0;hb=a503848d423fe1681879936da7b526b15f7eca23;hpb=c377fce0995ac5d669f74e75fdac02b90d8792b2

diff --git a/configure.in b/configure.in
index 4d4d2f4..ded529f 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.9-pre1],[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_ENABLE(mount,
+	[AC_HELP_STRING([--enable-mount],
+			[Create mount.nfs and don't use the util-linux mount(8) functionality. @<:@default=yes@:>@])],
+	enable_mount=$enableval,
+	enable_mount=yes)
+	AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -149,14 +156,15 @@ 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
+    dnl but we need to make sure we get the right version
     if test "$enable_gss" = yes; then
-     PKG_CHECK_MODULES(RPCSECGSS, librpcsecgss, [],
+     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
@@ -191,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
@@ -312,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