From: Luk Claes <luk@debian.org>
Date: Fri, 10 May 2013 08:01:25 +0000 (+0200)
Subject: Imported upstream 1.2.8
X-Git-Tag: debian/1%1.2.8-1~11^2~2
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=fb06ed9fc1fa11a95544fb2d89adb6c51ef5d946;hp=-c

Imported upstream 1.2.8
---

fb06ed9fc1fa11a95544fb2d89adb6c51ef5d946
diff --combined configure.ac
index 86e8308,d3ad854..7a885be
--- a/configure.ac
+++ b/configure.ac
@@@ -1,6 -1,6 +1,6 @@@
  dnl Process this file with autoconf to produce a configure script.
  dnl
- AC_INIT([linux nfs-utils],[1.2.6],[linux-nfs@vger.kernel.org],[nfs-utils])
+ AC_INIT([linux nfs-utils],[1.2.8],[linux-nfs@vger.kernel.org],[nfs-utils])
  AC_CANONICAL_BUILD([])
  AC_CANONICAL_HOST([])
  AC_CONFIG_MACRO_DIR(aclocal)
@@@ -76,7 -76,8 +76,8 @@@ AC_ARG_ENABLE(nfsv41
  	enable_nfsv41=yes)
  	if test "$enable_nfsv41" = yes; then
  		if test "$enable_nfsv4" != yes; then
- 			AC_MSG_ERROR([NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41])
+ 			AC_MSG_WARN([NFS v4 is not enabled. Disabling NFS v4.1])
+ 			enable_nfsv41=no
  		fi
  		BLKMAPD=blkmapd
  	else
@@@ -185,11 -186,11 +186,11 @@@ els
  	AM_CONDITIONAL(MOUNT_CONFIG, [test "$enable_mount" = "yes"])
  fi
  
- AC_ARG_ENABLE(nfsdcld,
- 	[AC_HELP_STRING([--enable-nfsdcld],
- 			[Create nfsdcld NFSv4 clientid tracking daemon. @<:@default=no@:>@])],
- 	enable_nfsdcld=$enableval,
- 	enable_nfsdcld="no")
+ AC_ARG_ENABLE(nfsdcltrack,
+ 	[AC_HELP_STRING([--enable-nfsdcltrack],
+ 			[enable NFSv4 clientid tracking programs @<:@default=yes@:>@])],
+ 	enable_nfsdctrack=$enableval,
+ 	enable_nfsdcltrack="yes")
  
  dnl Check for TI-RPC library and headers
  AC_LIBTIRPC
@@@ -269,31 -270,32 +270,33 @@@ if test "$enable_nfsv4" = yes; the
    dnl Check for sqlite3
    AC_SQLITE3_VERS
  
-   if test "$enable_nfsdcld" = "yes"; then
+   if test "$enable_nfsdcltrack" = "yes"; then
  	AC_CHECK_HEADERS([libgen.h sys/inotify.h], ,
- 		AC_MSG_ERROR([Cannot find header needed for nfsdcld]))
- 
-   	if test "$libsqlite3_cv_is_recent" != "yes" ; then
- 		AC_MSG_ERROR([nfsdcld requires sqlite3])
- 	fi
+ 		AC_MSG_ERROR([Cannot find header needed for nfsdcltrack]))
+ 
+     case $libsqlite3_cv_is_recent in
+     yes) ;;
+     unknown)
+       dnl do not fail when cross-compiling
+       AC_MSG_WARN([assuming sqlite is at least v3.3]) ;;
+     *)
+       AC_MSG_ERROR([nfsdcltrack requires sqlite-devel]) ;;
+     esac
    fi
  
-   AM_CONDITIONAL(CONFIG_NFSDCLD, [test "$enable_nfsdcld" = "yes" ])
- 
-   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
-     AC_RPCSEC_VERSION
-   fi
+ else
+   enable_nfsdcltrack="no"
  fi
  
 +
  if test "$enable_nfsv41" = yes; then
    AC_CHECK_LIB([devmapper], [dm_task_create], [LIBDEVMAPPER="-ldevmapper"], AC_MSG_ERROR([libdevmapper needed]))
    AC_CHECK_HEADER(libdevmapper.h, , AC_MSG_ERROR([Cannot find devmapper header file libdevmapper.h]))
+   AC_CHECK_HEADER(sys/inotify.h, , AC_MSG_ERROR([Cannot find header file sys/inotify.h]))
  fi
  
  dnl enable nfsidmap when its support by libnfsidmap
+ AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
  AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
  
  
@@@ -343,6 -345,20 +346,20 @@@ if test "$enable_gss" = yes; the
    dnl Invoked after AC_KERBEROS_V5; AC_LIBRPCSECGSS needs to have KRBLIBS set
    AC_LIBRPCSECGSS
  
+   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
+     AC_RPCSEC_VERSION
+     if test x"$GSSGLUE_LIBS" != x""; then
+       GSSAPI_CFLAGS=$GSSGLUE_CFLAGS
+       GSSAPI_LIBS=$GSSGLUE_LIBS
+     else
+       GSSAPI_CFLAGS=$GSSKRB_CFLAGS
+       GSSAPI_LIBS=$GSSKRB_LIBS
+     fi
+     AC_SUBST([GSSAPI_CFLAGS])
+     AC_SUBST([GSSAPI_LIBS])
+   fi
  fi
  
  dnl Check for IPv6 support
@@@ -356,7 -372,7 +373,7 @@@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h l
                   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 \
-                  ifaddrs.h nfs-plugin.h])
+                  ifaddrs.h nfs-plugin.h libio.h])
  
  dnl *************************************************************
  dnl Checks for typedefs, structures, and compiler characteristics
@@@ -394,7 -410,7 +411,7 @@@ AC_CHECK_FUNCS([alarm atexit dup2 fdata
                 gethostbyaddr gethostbyname gethostname getmntent \
                 getnameinfo getrpcbyname getifaddrs \
                 gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
-                realpath rmdir select socket strcasecmp strchr strdup \
+                ppoll realpath rmdir select socket strcasecmp strchr strdup \
                 strerror strrchr strtol strtoul sigprocmask])
  
  
@@@ -478,7 -494,7 +495,7 @@@ AC_CONFIG_FILES(
  	tools/nfs-iostat/Makefile
  	utils/Makefile
  	utils/blkmapd/Makefile
- 	utils/nfsdcld/Makefile
+ 	utils/nfsdcltrack/Makefile
  	utils/exportfs/Makefile
  	utils/gssd/Makefile
  	utils/idmapd/Makefile