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

Imported upstream 1.2.8
---

fb06ed9fc1fa11a95544fb2d89adb6c51ef5d946
diff --cc configure.ac
index 86e8308,d3ad854..7a885be
--- a/configure.ac
+++ b/configure.ac
@@@ -269,25 -270,24 +270,25 @@@ 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]))