X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=configure;h=33c347e78801994f4af3db1f6a5a5e4a7f68dcc7;hp=6378ae8bd4630dd03a03979fce1ad387e050a525;hb=9a5293a10551c03b4fb976503dd24da569fcadb3;hpb=fb9a269a1da825d06363b04f74fd9b70b8ca3eb4

diff --git a/configure b/configure
index 6378ae8..33c347e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for linux nfs-utils 1.2.4.
+# Generated by GNU Autoconf 2.68 for linux nfs-utils 1.2.6.
 #
 # Report bugs to <linux-nfs@vger.kernel.org>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='linux nfs-utils'
 PACKAGE_TARNAME='nfs-utils'
-PACKAGE_VERSION='1.2.4'
-PACKAGE_STRING='linux nfs-utils 1.2.4'
+PACKAGE_VERSION='1.2.6'
+PACKAGE_STRING='linux nfs-utils 1.2.6'
 PACKAGE_BUGREPORT='linux-nfs@vger.kernel.org'
 PACKAGE_URL=''
 
@@ -632,10 +632,13 @@ KRBDIR
 LIBMOUNT
 CONFIG_LIBMOUNT_FALSE
 CONFIG_LIBMOUNT_TRUE
+LIBDL
 LIBBLKID
 LIBBSD
 LIBCRYPT
 LIBSOCKET
+CONFIG_NFSIDMAP_FALSE
+CONFIG_NFSIDMAP_TRUE
 RPCSECGSS_LIBS
 RPCSECGSS_CFLAGS
 GSSGLUE_LIBS
@@ -643,9 +646,14 @@ GSSGLUE_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+CONFIG_NFSDCLD_FALSE
+CONFIG_NFSDCLD_TRUE
+CONFIG_SQLITE3_FALSE
+CONFIG_SQLITE3_TRUE
+LIBSQLITE
 LIBKEYUTILS
-CONFIG_NFSIDMAP_FALSE
-CONFIG_NFSIDMAP_TRUE
+LIBNFSIDMAP
+LIBEVENT
 LIBNSL
 CC_FOR_BUILD
 CXXCPP
@@ -678,6 +686,7 @@ HAVE_TCP_WRAPPER
 HAVE_LIBWRAP
 LIBWRAP
 LIBCAP
+LIBTIRPC
 EGREP
 GREP
 CPP
@@ -723,9 +732,9 @@ CONFIG_NFSV4_FALSE
 CONFIG_NFSV4_TRUE
 enable_nfsv4
 IDMAPD
-enable_nfsv3
 startstatd
 statduser
+statdpath
 statedir
 RELEASE
 MAINT
@@ -806,9 +815,9 @@ enable_option_checking
 enable_maintainer_mode
 with_release
 with_statedir
+with_statdpath
 with_statduser
 with_start_statd
-enable_nfsv3
 enable_nfsv4
 enable_nfsv41
 enable_gss
@@ -821,6 +830,7 @@ enable_tirpc
 enable_ipv6
 enable_mountconfig
 with_mountfile
+enable_nfsdcld
 with_tirpcinclude
 enable_dependency_tracking
 enable_caps
@@ -1397,7 +1407,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures linux nfs-utils 1.2.4 to adapt to many kinds of systems.
+\`configure' configures linux nfs-utils 1.2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1467,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of linux nfs-utils 1.2.4:";;
+     short | recursive ) echo "Configuration of linux nfs-utils 1.2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1477,18 +1487,19 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-nfsv3          enable support for NFSv3 [default=yes]
   --enable-nfsv4          enable support for NFSv4 [default=yes]
-  --enable-nfsv41         enable support for NFSv41 [default=no]
+  --enable-nfsv41         enable support for NFSv41 [default=yes]
   --enable-gss            enable support for rpcsec_gss [default=yes]
   --enable-kprefix        install progs as rpc.knfsd etc
   --disable-uuid          Exclude uuid support to avoid buggy libblkid
-  --enable-mount          Create mount.nfs and don't use the util-linux
+  --enable-mount          Create mount.nfs and do not use the util-linux
                           mount(8) functionality. [default=yes]
   --enable-libmount-mount Link mount.nfs with libmount (EXPERIMENTAL)
   --enable-tirpc          enable use of TI-RPC [default=yes]
   --enable-ipv6           enable support for IPv6 [default=no]
   --enable-mountconfig    enable mount to use a configuration file
+  --enable-nfsdcld        Create nfsdcld NFSv4 clientid tracking daemon.
+                          [default=no]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-caps          Disable capabilities support
@@ -1503,7 +1514,9 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-release=XXX      set release to XXX [1]
-  --with-statedir=/foo    use state dir /foo /var/lib/nfs
+  --with-statedir=/foo    use state dir /foo [default=/var/lib/nfs]
+  --with-statdpath=/foo   define the statd state dir as /foo instead of the
+                          NFS statedir [default=/var/lib/nfs]
   --with-statduser=rpcuser
                           statd to run under [rpcuser or nobody]
   --with-start-statd=scriptname
@@ -1615,7 +1628,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-linux nfs-utils configure 1.2.4
+linux nfs-utils configure 1.2.6
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2102,52 +2115,6 @@ fi
 
 } # ac_fn_cxx_try_link
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2383,7 +2350,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by linux nfs-utils $as_me 1.2.4, which was
+It was created by linux nfs-utils $as_me 1.2.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3270,7 +3237,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='nfs-utils'
- VERSION='1.2.4'
+ VERSION='1.2.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3355,6 +3322,16 @@ fi
 
 
 
+# Check whether --with-statdpath was given.
+if test "${with_statdpath+set}" = set; then :
+  withval=$with_statdpath; statdpath=$withval
+else
+  statdpath=$statedir
+
+fi
+
+
+
 # Check whether --with-statduser was given.
 if test "${with_statduser+set}" = set; then :
   withval=$with_statduser; statduser=$withval
@@ -3386,21 +3363,6 @@ cat >>confdefs.h <<_ACEOF
 #define START_STATD "$startstatd"
 _ACEOF
 
-# Check whether --enable-nfsv3 was given.
-if test "${enable_nfsv3+set}" = set; then :
-  enableval=$enable_nfsv3; enable_nfsv3=$enableval
-else
-  enable_nfsv3=yes
-fi
-
-	if test "$enable_nfsv3" = yes; then
-
-$as_echo "#define NFS3_SUPPORTED 1" >>confdefs.h
-
-	else
-		enable_nfsv3=
-	fi
-
 # Check whether --enable-nfsv4 was given.
 if test "${enable_nfsv4+set}" = set; then :
   enableval=$enable_nfsv4; enable_nfsv4=$enableval
@@ -3409,9 +3371,6 @@ else
 fi
 
 	if test "$enable_nfsv4" = yes; then
-
-$as_echo "#define NFS4_SUPPORTED 1" >>confdefs.h
-
 		IDMAPD=idmapd
 	else
 		enable_nfsv4=
@@ -3432,15 +3391,17 @@ fi
 if test "${enable_nfsv41+set}" = set; then :
   enableval=$enable_nfsv41; enable_nfsv41=$enableval
 else
-  enable_nfsv41=no
+  enable_nfsv41=yes
 fi
 
 	if test "$enable_nfsv41" = yes; then
-
-$as_echo "#define NFS41_SUPPORTED 1" >>confdefs.h
-
+		if test "$enable_nfsv4" != yes; then
+			as_fn_error $? "NFS v4.1 is enabled but NFS v4 is not. Use --disable-nfsv41" "$LINENO" 5
+		fi
+		BLKMAPD=blkmapd
 	else
 		enable_nfsv41=
+		BLKMAPD=
 	fi
 
 	 if test "$enable_nfsv41" = "yes"; then
@@ -3460,9 +3421,6 @@ else
 fi
 
 	if test "$enable_gss" = yes; then
-
-$as_echo "#define GSS_SUPPORTED 1" >>confdefs.h
-
 		GSSD=gssd
 		SVCGSSD=svcgssd
 	else
@@ -3498,14 +3456,14 @@ else
 fi
 
 	RPCGEN_PATH=
-	if test "$rpcgen_path" == "yes"; then
+	if test "$rpcgen_path" = "yes"; then
 	    for p in /usr/local/bin/rpcgen /usr/bin/rpcgen /bin/rpcgen
 	    do if test -f $p ; then RPCGEN_PATH=$p ; break; fi ; done
 	elif test "$rpcgen_path" != "internal"; then
 	    RPCGEN_PATH=$rpcgen_path
 	fi
 
-	 if test "$RPCGEN_PATH" == ""; then
+	 if test "$RPCGEN_PATH" = ""; then
   CONFIG_RPCGEN_TRUE=
   CONFIG_RPCGEN_FALSE='#'
 else
@@ -3539,7 +3497,7 @@ fi
 if test "$enable_mount" = yes; then
 	# Check whether --enable-libmount-mount was given.
 if test "${enable_libmount_mount+set}" = set; then :
-  enableval=$enable_libmount_mount; enable_libmount=yes
+  enableval=$enable_libmount_mount; enable_libmount=$enableval
 else
   enable_libmount=no
 fi
@@ -3626,6 +3584,14 @@ fi
 
 fi
 
+# Check whether --enable-nfsdcld was given.
+if test "${enable_nfsdcld+set}" = set; then :
+  enableval=$enable_nfsdcld; enable_nfsdcld=$enableval
+else
+  enable_nfsdcld="no"
+fi
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5054,12 +5020,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_clnt_tli_create" >&5
 $as_echo "$ac_cv_lib_tirpc_clnt_tli_create" >&6; }
 if test "x$ac_cv_lib_tirpc_clnt_tli_create" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTIRPC 1
-_ACEOF
-
-  LIBS="-ltirpc $LIBS"
-
+  :
 else
   if test "$enable_tirpc" = "yes"; then
 			as_fn_error $? "libtirpc not found." "$LINENO" 5
@@ -5098,6 +5059,17 @@ done
 
   fi
 
+    if test "$enable_tirpc" != "no"; then
+
+$as_echo "#define HAVE_LIBTIRPC 1" >>confdefs.h
+
+    LIBTIRPC="-ltirpc"
+  else
+    LIBTIRPC=""
+  fi
+
+
+
 
 
 
@@ -10220,10 +10192,6 @@ _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
@@ -17637,6 +17605,47 @@ if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
 fi
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlclose in -ldl" >&5
+$as_echo_n "checking for dlclose in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlclose+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlclose ();
+int
+main ()
+{
+return dlclose ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlclose=yes
+else
+  ac_cv_lib_dl_dlclose=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlclose" >&5
+$as_echo "$ac_cv_lib_dl_dlclose" >&6; }
+if test "x$ac_cv_lib_dl_dlclose" = xyes; then :
+  LIBDL="-ldl"
+fi
+
+
 if test "$enable_nfsv4" = yes; then
 
 
@@ -17677,12 +17686,13 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_event_event_dispatch" >&5
 $as_echo "$ac_cv_lib_event_event_dispatch" >&6; }
 if test "x$ac_cv_lib_event_event_dispatch" = xyes; then :
-  libevent=1
+  LIBEVENT=-levent
 else
   as_fn_error $? "libevent not found." "$LINENO" 5
 fi
 
 
+
   for ac_header in event.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "event.h" "ac_cv_header_event_h" "$ac_includes_default"
@@ -17739,7 +17749,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
-  libnfsidmap=1
+  LIBNFSIDMAP=-lnfsidmap
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
@@ -17803,7 +17813,7 @@ $as_echo "#define HAVE_NFS4_SET_DEBUG 1" >>confdefs.h
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -17840,21 +17850,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
-  enable_nfsidmap=yes
-else
-  enable_nfsidmap=no
+  :
 fi
 
 
 
 
-     if test "$enable_nfsidmap" = "yes"; then
-  CONFIG_NFSIDMAP_TRUE=
-  CONFIG_NFSIDMAP_FALSE='#'
-else
-  CONFIG_NFSIDMAP_TRUE='#'
-  CONFIG_NFSIDMAP_FALSE=
-fi
 
 
 
@@ -17909,13 +17910,150 @@ if test "x$ac_cv_header_keyutils_h" = xyes; then :
 #define HAVE_KEYUTILS_H 1
 _ACEOF
 
+fi
+
+done
+
+
+
+
+
+  for ac_header in sqlite3.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3_H 1
+_ACEOF
+
+fi
+
+done
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_libversion_number in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_libversion_number in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_libversion_number+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqlite3_libversion_number ();
+int
+main ()
+{
+return sqlite3_libversion_number ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_sqlite3_sqlite3_libversion_number=yes
 else
-  as_fn_error $? "keyutils.h header not found." "$LINENO" 5
+  ac_cv_lib_sqlite3_sqlite3_libversion_number=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_libversion_number" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_libversion_number" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_libversion_number" = xyes; then :
+  LIBSQLITE=-lsqlite3
+fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suitable sqlite3 version" >&5
+$as_echo_n "checking for suitable sqlite3 version... " >&6; }
+
+  if ${libsqlite3_cv_is_recent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    saved_LIBS="$LIBS"
+    LIBS=-lsqlite3
+    if test "$cross_compiling" = yes; then :
+  libsqlite3_cv_is_recent=unknown
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+	#include <stdio.h>
+	#include <sqlite3.h>
+	int main()
+	{
+		int vers = sqlite3_libversion_number();
+
+		return vers != SQLITE_VERSION_NUMBER ||
+			vers < 3003000;
+	}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  libsqlite3_cv_is_recent=yes
+else
+  libsqlite3_cv_is_recent=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    LIBS="$saved_LIBS"
+fi
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libsqlite3_cv_is_recent" >&5
+$as_echo "$libsqlite3_cv_is_recent" >&6; }
+   if test "$libsqlite3_cv_is_recent" = "yes"; then
+  CONFIG_SQLITE3_TRUE=
+  CONFIG_SQLITE3_FALSE='#'
+else
+  CONFIG_SQLITE3_TRUE='#'
+  CONFIG_SQLITE3_FALSE=
+fi
+
+
+
+  if test "$enable_nfsdcld" = "yes"; then
+	for ac_header in libgen.h sys/inotify.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+else
+  as_fn_error $? "Cannot find header needed for nfsdcld" "$LINENO" 5
 fi
 
 done
 
 
+  	if test "$libsqlite3_cv_is_recent" != "yes" ; then
+		as_fn_error $? "nfsdcld requires sqlite3" "$LINENO" 5
+	fi
+  fi
+
+   if test "$enable_nfsdcld" = "yes" ; then
+  CONFIG_NFSDCLD_TRUE=
+  CONFIG_NFSDCLD_FALSE='#'
+else
+  CONFIG_NFSDCLD_TRUE='#'
+  CONFIG_NFSDCLD_FALSE=
+fi
+
 
       if test "$enable_gss" = yes; then
 
@@ -18048,12 +18186,12 @@ if test -n "$GSSGLUE_CFLAGS"; then
     pkg_cv_GSSGLUE_CFLAGS="$GSSGLUE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSSGLUE_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.1" 2>/dev/null`
+  pkg_cv_GSSGLUE_CFLAGS=`$PKG_CONFIG --cflags "libgssglue >= 0.3" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18064,12 +18202,12 @@ if test -n "$GSSGLUE_LIBS"; then
     pkg_cv_GSSGLUE_LIBS="$GSSGLUE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgssglue >= 0.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libgssglue >= 0.3") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GSSGLUE_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.1" 2>/dev/null`
+  pkg_cv_GSSGLUE_LIBS=`$PKG_CONFIG --libs "libgssglue >= 0.3" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18089,14 +18227,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgssglue >= 0.1" 2>&1`
+	        GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgssglue >= 0.3" 2>&1`
         else
-	        GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgssglue >= 0.1" 2>&1`
+	        GSSGLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgssglue >= 0.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GSSGLUE_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libgssglue >= 0.1) were not met:
+	as_fn_error $? "Package requirements (libgssglue >= 0.3) were not met:
 
 $GSSGLUE_PKG_ERRORS
 
@@ -18229,6 +18367,69 @@ fi
   fi
 fi
 
+if test "$enable_nfsv41" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dm_task_create in -ldevmapper" >&5
+$as_echo_n "checking for dm_task_create in -ldevmapper... " >&6; }
+if ${ac_cv_lib_devmapper_dm_task_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldevmapper  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dm_task_create ();
+int
+main ()
+{
+return dm_task_create ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_devmapper_dm_task_create=yes
+else
+  ac_cv_lib_devmapper_dm_task_create=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_devmapper_dm_task_create" >&5
+$as_echo "$ac_cv_lib_devmapper_dm_task_create" >&6; }
+if test "x$ac_cv_lib_devmapper_dm_task_create" = xyes; then :
+  LIBDEVMAPPER="-ldevmapper"
+else
+  as_fn_error $? "libdevmapper needed" "$LINENO" 5
+fi
+
+  ac_fn_c_check_header_mongrel "$LINENO" "libdevmapper.h" "ac_cv_header_libdevmapper_h" "$ac_includes_default"
+if test "x$ac_cv_header_libdevmapper_h" = xyes; then :
+
+else
+  as_fn_error $? "Cannot find devmapper header file libdevmapper.h" "$LINENO" 5
+fi
+
+
+fi
+
+ if test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"; then
+  CONFIG_NFSIDMAP_TRUE=
+  CONFIG_NFSIDMAP_FALSE='#'
+else
+  CONFIG_NFSIDMAP_TRUE='#'
+  CONFIG_NFSIDMAP_FALSE=
+fi
+
+
+
 if test "$knfsd_cv_glibc2" = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for daemon in -lbsd" >&5
 $as_echo_n "checking for daemon in -lbsd... " >&6; }
@@ -18384,6 +18585,7 @@ fi
 
 
 
+
 if test "$enable_libmount" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mnt_context_do_mount in -lmount" >&5
 $as_echo_n "checking for mnt_context_do_mount in -lmount... " >&6; }
@@ -18494,7 +18696,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_init_name_mapping" = xyes; then :
-  libnfsidmap=1
+  LIBNFSIDMAP=-lnfsidmap
 else
   as_fn_error $? "libnfsidmap not found." "$LINENO" 5
 fi
@@ -18558,7 +18760,7 @@ $as_echo "#define HAVE_NFS4_SET_DEBUG 1" >>confdefs.h
 fi
 
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nfs4_owner_to_uid in -lnfsidmap" >&5
 $as_echo_n "checking for nfs4_owner_to_uid in -lnfsidmap... " >&6; }
 if ${ac_cv_lib_nfsidmap_nfs4_owner_to_uid+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -18595,28 +18797,12 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&5
 $as_echo "$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" >&6; }
 if test "x$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = xyes; then :
-  enable_nfsidmap=yes
-else
-  enable_nfsidmap=no
+  :
 fi
 
 
 
 
-  for ac_header in spkm3.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "spkm3.h" "ac_cv_header_spkm3_h" "$ac_includes_default"
-if test "x$ac_cv_header_spkm3_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_SPKM3_H 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not locate SPKM3 header; will not have SPKM3 support" >&5
-$as_echo "$as_me: WARNING: Could not locate SPKM3 header; will not have SPKM3 support" >&2;}
-fi
-
-done
 
 
 
@@ -18649,7 +18835,7 @@ fi
     fi
     if test "$K5CONFIG" != ""; then
       KRBCFLAGS=`$K5CONFIG --cflags`
-      KRBLIBS=`$K5CONFIG --libs gssapi`
+      KRBLIBS=`$K5CONFIG --libs`
       K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v["3"] == "") v["3"] = "0"; print v["1"]v["2"]v["3"] }'`
 
 cat >>confdefs.h <<_ACEOF
@@ -19038,22 +19224,13 @@ fi
 
 
 
-  ac_fn_c_check_decl "$LINENO" "AI_ADDRCONFIG" "ac_cv_have_decl_AI_ADDRCONFIG" " #include <netdb.h>
-"
-if test "x$ac_cv_have_decl_AI_ADDRCONFIG" = xyes; then :
-
-$as_echo "#define HAVE_DECL_AI_ADDRCONFIG 1" >>confdefs.h
-
-fi
-
-
   if test "$enable_ipv6" = yes; then
 
         if test "$enable_tirpc" = no; then
       as_fn_error $? "'--enable-ipv6' requires TIRPC support." "$LINENO" 5
     fi
 
-        for ac_func in getifaddrs getnameinfo bindresvport_sa
+        for ac_func in getifaddrs getnameinfo
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -19068,14 +19245,47 @@ fi
 done
 
 
-            ac_fn_c_check_decl "$LINENO" "AI_ADDRCONFIG" "ac_cv_have_decl_AI_ADDRCONFIG" " #include <netdb.h>
-"
-if test "x$ac_cv_have_decl_AI_ADDRCONFIG" = xyes; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindresvport_sa in -ltirpc" >&5
+$as_echo_n "checking for bindresvport_sa in -ltirpc... " >&6; }
+if ${ac_cv_lib_tirpc_bindresvport_sa+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ltirpc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindresvport_sa ();
+int
+main ()
+{
+return bindresvport_sa ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_tirpc_bindresvport_sa=yes
 else
-  as_fn_error $? "full getaddrinfo(3) implementation needed for IPv6 support" "$LINENO" 5
+  ac_cv_lib_tirpc_bindresvport_sa=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tirpc_bindresvport_sa" >&5
+$as_echo "$ac_cv_lib_tirpc_bindresvport_sa" >&6; }
+if test "x$ac_cv_lib_tirpc_bindresvport_sa" = xyes; then :
+  :
+else
+  as_fn_error $? "Missing library functions needed for IPv6." "$LINENO" 5
 fi
-
 
   fi
 
@@ -19086,7 +19296,7 @@ for ac_header in arpa/inet.h fcntl.h libintl.h limits.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 \
-                 ifaddrs.h
+                 ifaddrs.h nfs-plugin.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -20913,6 +21123,11 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+cat >>confdefs.h <<_ACEOF
+#define NSM_DEFAULT_STATEDIR "$statdpath"
+_ACEOF
+
+
 if test "x$cross_compiling" = "xno"; then
 	CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-"$CFLAGS"}
 	CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-"$CXXFLAGS"}
@@ -20949,7 +21164,7 @@ AM_CFLAGS="$my_am_cflags"
 ACLOCAL_AMFLAGS="-I $ac_macro_dir \$(ACLOCAL_FLAGS)"
 
 
-ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile utils/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile tests/Makefile tests/nsm_client/Makefile"
+ac_config_files="$ac_config_files Makefile linux-nfs/Makefile support/Makefile support/export/Makefile support/include/nfs/Makefile support/include/rpcsvc/Makefile support/include/sys/fs/Makefile support/include/sys/Makefile support/include/Makefile support/misc/Makefile support/nfs/Makefile support/nsm/Makefile tools/Makefile tools/locktest/Makefile tools/nlmtest/Makefile tools/rpcdebug/Makefile tools/rpcgen/Makefile tools/mountstats/Makefile tools/nfs-iostat/Makefile utils/Makefile utils/blkmapd/Makefile utils/nfsdcld/Makefile utils/exportfs/Makefile utils/gssd/Makefile utils/idmapd/Makefile utils/mount/Makefile utils/mountd/Makefile utils/nfsd/Makefile utils/nfsstat/Makefile utils/nfsidmap/Makefile utils/showmount/Makefile utils/statd/Makefile utils/osd_login/Makefile tests/Makefile tests/nsm_client/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -21120,6 +21335,14 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_SQLITE3_TRUE}" && test -z "${CONFIG_SQLITE3_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_SQLITE3\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${CONFIG_NFSDCLD_TRUE}" && test -z "${CONFIG_NFSDCLD_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_NFSDCLD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_NFSIDMAP_TRUE}" && test -z "${CONFIG_NFSIDMAP_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NFSIDMAP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21537,7 +21760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by linux nfs-utils $as_me 1.2.4, which was
+This file was extended by linux nfs-utils $as_me 1.2.6, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21603,7 +21826,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-linux nfs-utils config.status 1.2.4
+linux nfs-utils config.status 1.2.6
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -22132,6 +22355,8 @@ do
     "tools/mountstats/Makefile") CONFIG_FILES="$CONFIG_FILES tools/mountstats/Makefile" ;;
     "tools/nfs-iostat/Makefile") CONFIG_FILES="$CONFIG_FILES tools/nfs-iostat/Makefile" ;;
     "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
+    "utils/blkmapd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/blkmapd/Makefile" ;;
+    "utils/nfsdcld/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsdcld/Makefile" ;;
     "utils/exportfs/Makefile") CONFIG_FILES="$CONFIG_FILES utils/exportfs/Makefile" ;;
     "utils/gssd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/gssd/Makefile" ;;
     "utils/idmapd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/idmapd/Makefile" ;;
@@ -22142,6 +22367,7 @@ do
     "utils/nfsidmap/Makefile") CONFIG_FILES="$CONFIG_FILES utils/nfsidmap/Makefile" ;;
     "utils/showmount/Makefile") CONFIG_FILES="$CONFIG_FILES utils/showmount/Makefile" ;;
     "utils/statd/Makefile") CONFIG_FILES="$CONFIG_FILES utils/statd/Makefile" ;;
+    "utils/osd_login/Makefile") CONFIG_FILES="$CONFIG_FILES utils/osd_login/Makefile" ;;
     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
     "tests/nsm_client/Makefile") CONFIG_FILES="$CONFIG_FILES tests/nsm_client/Makefile" ;;