Merge branch 'upstream'

[nfs-utils.git] / configure.in

diff --git a/configure.in b/configure.in
index c971d2eb988c5ccfc93cb2ed7485e60493289835..8b538a305b617bde8da34a86de2c81a6dd5e5d22 100644 (file)
--- 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-rc3],[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)
@@ -148,6 +148,18 @@ if test "$enable_nfsv4" = yes; then
     AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, [libnfsidmap=1], [AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
     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 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
     AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
@@ -166,7 +178,7 @@ if test "$enable_gss" = yes; then
   AC_KERBEROS_V5
 
   dnl This is not done until here because we need to have KRBLIBS set
-  dnl "librpcsecgss=1" is so that it doesn't get added to LIBS
+  dnl ("librpcsecgss=1" is so that it doesn't get added to LIBS)
   AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], [AC_MSG_ERROR(librpcsecgss needed for nfsv4 support)], $KRBLIBS)
   AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level,
               AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, $KRBLIBS)
@@ -216,7 +228,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])