Imported upstream 1.2.6

diff --cc configure.ac
index 80fb39d3f42e5c89ead0a4f744db9aff509dde20,9ba53e284ea4e7f8e34f045631c9e86698e56954..583c603f1b6c8123f3f0dc4abdee6e70a6c5e377
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -265,10 -286,16 +286,19 @@@ if test "$enable_nfsv4" = yes; the
      AC_RPCSEC_VERSION
    fi
  fi
 +dnl enable nfsidmap when its support by libnfsidmap
 +AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
 +
  
+ 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]))
+ fi
+ 
+ dnl enable nfsidmap when its support by libnfsidmap
+ AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$ac_cv_header_keyutils_h$ac_cv_lib_nfsidmap_nfs4_owner_to_uid" = "yesyes"])
+ 
+ 
  if test "$knfsd_cv_glibc2" = no; then
      AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
  fi