From: Luk Claes <luk@debian.org>
Date: Tue, 22 May 2012 06:06:10 +0000 (+0200)
Subject: Imported upstream 1.2.6
X-Git-Tag: upstream/1.2.6
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=adee9b7bddedcddb8de4e0b7c2f778148b1f4d2b;p=nfs-utils.git

Imported upstream 1.2.6
---

adee9b7bddedcddb8de4e0b7c2f778148b1f4d2b
diff --cc configure.ac
index 80fb39d,9ba53e2..583c603
--- a/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